Skip to content

Commit 1a7a666

Browse files
committed
action runner loongarch64 v2.319.1
1 parent bc6614c commit 1a7a666

File tree

17 files changed

+39
-15
lines changed

17 files changed

+39
-15
lines changed

Diff for: src/Directory.Build.props

+3
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@
4444
<PropertyGroup Condition="'$(BUILD_OS)' == 'Linux' AND '$(PackageRuntime)' == 'linux-arm64'">
4545
<DefineConstants>$(DefineConstants);ARM64</DefineConstants>
4646
</PropertyGroup>
47+
<PropertyGroup Condition="'$(BUILD_OS)' == 'Linux' AND '$(PackageRuntime)' == 'linux-loongarch64'">
48+
<DefineConstants>$(DefineConstants);LOONGARCH64</DefineConstants>
49+
</PropertyGroup>
4750

4851
<!-- Set TRACE/DEBUG vars -->
4952
<PropertyGroup>

Diff for: src/Misc/dotnet-install.sh

+9-1
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,10 @@ get_machine_architecture() {
307307
echo "arm64"
308308
return 0
309309
;;
310+
loongarch64)
311+
echo "loongarch64"
312+
return 0
313+
;;
310314
esac
311315
fi
312316

@@ -338,6 +342,10 @@ get_normalized_architecture_from_architecture() {
338342
echo "arm64"
339343
return 0
340344
;;
345+
loongarch64)
346+
echo "loongarch64"
347+
return 0
348+
;;
341349
esac
342350

343351
say_err "Architecture \`$architecture\` not supported. If you think this is a bug, report it at https://github.com/dotnet/install-scripts/issues"
@@ -1129,7 +1137,7 @@ do
11291137
echo " -InstallDir"
11301138
echo " --architecture <ARCHITECTURE> Architecture of dotnet binaries to be installed, Defaults to \`$architecture\`."
11311139
echo " --arch,-Architecture,-Arch"
1132-
echo " Possible values: x64, arm, and arm64"
1140+
echo " Possible values: x64, arm, arm64 and loongarch64"
11331141
echo " --os <system> Specifies operating system to be used when selecting the installer."
11341142
echo " Overrides the OS determination approach used by the script. Supported values: osx, linux, linux-musl, freebsd, rhel.6."
11351143
echo " In case any other value is provided, the platform will be determined by the script based on machine configuration."

Diff for: src/Misc/externals.sh

+5
Original file line numberDiff line numberDiff line change
@@ -190,3 +190,8 @@ if [[ "$PACKAGERUNTIME" == "linux-arm" ]]; then
190190
acquireExternalTool "$NODE_URL/v${NODE16_VERSION}/node-v${NODE16_VERSION}-linux-armv7l.tar.gz" node16 fix_nested_dir
191191
acquireExternalTool "$NODE_URL/v${NODE20_VERSION}/node-v${NODE20_VERSION}-linux-armv7l.tar.gz" node20 fix_nested_dir
192192
fi
193+
194+
if [[ "$PACKAGERUNTIME" == "linux-loongarch64" ]]; then
195+
acquireExternalTool http://ftp.loongnix.cn/nodejs/LoongArch/dist/v16.20.2/node-v16.20.2-linux-loong64.tar.gz node16 fix_nested_dir
196+
acquireExternalTool http://ftp.loongnix.cn/nodejs/LoongArch/dist/v20.13.0/node-v20.13.0-linux-loong64.tar.gz node20 fix_nested_dir
197+
fi

Diff for: src/NuGet.Config

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<packageSources>
44
<!--To inherit the global NuGet package sources remove the <clear/> line below -->
55
<clear />
6+
<add key="loongson" value="https://nuget.loongnix.cn/v3/index.json" />
67
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
78
</packageSources>
89
</configuration>

Diff for: src/Runner.Common/Constants.cs

+4-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ public enum Architecture
5858
X86,
5959
X64,
6060
Arm,
61-
Arm64
61+
Arm64,
62+
LoongArch64
6263
}
6364

6465
public static class Runner
@@ -81,6 +82,8 @@ public static class Runner
8182
public static readonly Architecture PlatformArchitecture = Architecture.Arm;
8283
#elif ARM64
8384
public static readonly Architecture PlatformArchitecture = Architecture.Arm64;
85+
#elif LOONGARCH64
86+
public static readonly Architecture PlatformArchitecture = Architecture.LoongArch64;
8487
#else
8588
public static readonly Architecture PlatformArchitecture = Architecture.X64;
8689
#endif

Diff for: src/Runner.Common/Runner.Common.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<TargetFramework>net6.0</TargetFramework>
55
<OutputType>Library</OutputType>
6-
<RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
6+
<RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;linux-loongarch64;osx-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
77
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
88
<NoWarn>NU1701;NU1603</NoWarn>
99
<Version>$(Version)</Version>

Diff for: src/Runner.Common/Util/VarUtil.cs

+2
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ public static string OSArchitecture
5353
return "ARM";
5454
case Constants.Architecture.Arm64:
5555
return "ARM64";
56+
case Constants.Architecture.LoongArch64:
57+
return "LOONGARCH64";
5658
default:
5759
throw new NotSupportedException(); // Should never reach here.
5860
}

Diff for: src/Runner.Listener/Runner.Listener.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<TargetFramework>net6.0</TargetFramework>
55
<OutputType>Exe</OutputType>
6-
<RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
6+
<RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;linux-loongarch64;osx-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
77
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
88
<NoWarn>NU1701;NU1603</NoWarn>
99
<Version>$(Version)</Version>

Diff for: src/Runner.PluginHost/Runner.PluginHost.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<TargetFramework>net6.0</TargetFramework>
55
<OutputType>Exe</OutputType>
6-
<RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
6+
<RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;linux-loongarch64;osx-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
77
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
88
<NoWarn>NU1701;NU1603</NoWarn>
99
<Version>$(Version)</Version>

Diff for: src/Runner.Plugins/Runner.Plugins.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<TargetFramework>net6.0</TargetFramework>
55
<OutputType>Library</OutputType>
6-
<RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
6+
<RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;linux-loongarch64;osx-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
77
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
88
<NoWarn>NU1701;NU1603</NoWarn>
99
<Version>$(Version)</Version>

Diff for: src/Runner.Sdk/Runner.Sdk.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<TargetFramework>net6.0</TargetFramework>
55
<OutputType>Library</OutputType>
6-
<RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
6+
<RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;linux-loongarch64;osx-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
77
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
88
<NoWarn>NU1701;NU1603</NoWarn>
99
<Version>$(Version)</Version>

Diff for: src/Runner.Worker/Runner.Worker.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<TargetFramework>net6.0</TargetFramework>
55
<OutputType>Exe</OutputType>
6-
<RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
6+
<RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;linux-loongarch64;osx-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
77
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
88
<NoWarn>NU1701;NU1603</NoWarn>
99
<Version>$(Version)</Version>

Diff for: src/Sdk/Sdk.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<TargetFramework>net6.0</TargetFramework>
55
<OutputType>Library</OutputType>
6-
<RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
6+
<RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;linux-loongarch64;osx-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
77
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
88
<NoWarn>NU1701;NU1603</NoWarn>
99
<Version>$(Version)</Version>

Diff for: src/Test/L0/ConstantGenerationL0.cs

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ public void BuildConstantGenerateSucceed()
2020
"linux-x64",
2121
"linux-arm",
2222
"linux-arm64",
23+
"linux-loongarch64",
2324
"osx-x64",
2425
"osx-arm64"
2526
};

Diff for: src/TestDotNet8Compatibility/global.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "8.0.303"
3+
"version": "8.0.108"
44
}
55
}

Diff for: src/dev.sh

+5-4
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ LAYOUT_DIR="$SCRIPT_DIR/../_layout"
1717
DOWNLOAD_DIR="$SCRIPT_DIR/../_downloads/netcore2x"
1818
PACKAGE_DIR="$SCRIPT_DIR/../_package"
1919
DOTNETSDK_ROOT="$SCRIPT_DIR/../_dotnetsdk"
20-
DOTNETSDK_VERSION="6.0.421"
20+
DOTNETSDK_VERSION="6.0.126"
2121
DOTNETSDK_INSTALLDIR="$DOTNETSDK_ROOT/$DOTNETSDK_VERSION"
22-
DOTNET8SDK_VERSION="8.0.303"
22+
DOTNET8SDK_VERSION="8.0.108"
2323
DOTNET8SDK_INSTALLDIR="$DOTNETSDK_ROOT/$DOTNET8SDK_VERSION"
2424
RUNNER_VERSION=$(cat runnerversion)
2525

@@ -56,6 +56,7 @@ elif [[ "$CURRENT_PLATFORM" == 'linux' ]]; then
5656
case $CPU_NAME in
5757
armv7l) RUNTIME_ID="linux-arm";;
5858
aarch64) RUNTIME_ID="linux-arm64";;
59+
loongarch64) RUNTIME_ID="linux-loongarch64";;
5960
esac
6061
fi
6162
elif [[ "$CURRENT_PLATFORM" == 'darwin' ]]; then
@@ -74,15 +75,15 @@ fi
7475

7576
# Make sure current platform support publish the dotnet runtime
7677
# Windows can publish win-x86/x64/arm64
77-
# Linux can publish linux-x64/arm/arm64
78+
# Linux can publish linux-x64/arm/arm64/loongarch64
7879
# OSX can publish osx-x64/arm64
7980
if [[ "$CURRENT_PLATFORM" == 'windows' ]]; then
8081
if [[ ("$RUNTIME_ID" != 'win-x86') && ("$RUNTIME_ID" != 'win-x64') && ("$RUNTIME_ID" != 'win-arm64') ]]; then
8182
echo "Failed: Can't build $RUNTIME_ID package $CURRENT_PLATFORM" >&2
8283
exit 1
8384
fi
8485
elif [[ "$CURRENT_PLATFORM" == 'linux' ]]; then
85-
if [[ ("$RUNTIME_ID" != 'linux-x64') && ("$RUNTIME_ID" != 'linux-x86') && ("$RUNTIME_ID" != 'linux-arm64') && ("$RUNTIME_ID" != 'linux-arm') ]]; then
86+
if [[ ("$RUNTIME_ID" != 'linux-x64') && ("$RUNTIME_ID" != 'linux-x86') && ("$RUNTIME_ID" != 'linux-arm64') && ("$RUNTIME_ID" != 'linux-arm') && ("$RUNTIME_ID" != 'linux-loongarch64') ]]; then
8687
echo "Failed: Can't build $RUNTIME_ID package $CURRENT_PLATFORM" >&2
8788
exit 1
8889
fi

Diff for: src/global.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "6.0.421"
3+
"version": "6.0.126"
44
}
55
}

0 commit comments

Comments
 (0)