Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions images/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ ARG TARGETOS
ARG TARGETARCH
ARG RUNNER_VERSION
ARG RUNNER_CONTAINER_HOOKS_VERSION=0.7.0
ARG DOCKER_VERSION=29.9.0
ARG BUILDX_VERSION=0.38.0
ARG DOCKER_VERSION=29.9.2
ARG BUILDX_VERSION=0.38.1

RUN apt update -y && apt install curl unzip -y

Expand Down
2 changes: 1 addition & 1 deletion patches/last_processed_commit.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9abfe11d2abd9de09d3a8d933d7ed701ea0518a3
4197182ef8f39c719f66038c1bc9b34cd9e9ac9a
18 changes: 9 additions & 9 deletions patches/runner-main-sdk8-arm.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/src/Misc/externals.sh b/src/Misc/externals.sh
index 90978b6d..ee3fd607 100755
index c385c5ef..6a83be46 100755
--- a/src/Misc/externals.sh
+++ b/src/Misc/externals.sh
@@ -4,6 +4,9 @@ PRECACHE=$2
Expand All @@ -19,18 +19,18 @@ index 90978b6d..ee3fd607 100755
+ acquireExternalTool "$NODE_URL/v${NODE22_VERSION}/node-v${NODE22_VERSION}-linux-armv7l.tar.gz" node22 fix_nested_dir
fi
diff --git a/src/Runner.Common/Constants.cs b/src/Runner.Common/Constants.cs
index 4acf4943..97d3dd87 100644
index 3c9a1768..d63bdf18 100644
--- a/src/Runner.Common/Constants.cs
+++ b/src/Runner.Common/Constants.cs
@@ -197,6 +197,7 @@ namespace GitHub.Runner.Common
@@ -198,6 +198,7 @@ namespace GitHub.Runner.Common
// Node versions
public static readonly string Node20 = "node20";
public static readonly string Node24 = "node24";
+ public static readonly string Node22 = "node22";

// Environment variables for controlling node version selection
public static readonly string ForceNode24Variable = "FORCE_JAVASCRIPT_ACTIONS_TO_NODE24";
@@ -211,6 +212,12 @@ namespace GitHub.Runner.Common
@@ -212,6 +213,12 @@ namespace GitHub.Runner.Common
public static readonly string DeprecateLinuxArm32Flag = "actions_runner_deprecate_linux_arm32";
public static readonly string KillLinuxArm32Flag = "actions_runner_kill_linux_arm32";

Expand Down Expand Up @@ -599,27 +599,27 @@ index 5ad39f3c..5cbc9c0d 100644
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
<NoWarn>NU1701;NU1603;NU1603;xUnit2013;SYSLIB0050;SYSLIB0051</NoWarn>
diff --git a/src/dev.sh b/src/dev.sh
index 5fd2b549..e12b1f2c 100755
index e4e8d10d..e12b1f2c 100755
--- a/src/dev.sh
+++ b/src/dev.sh
@@ -17,7 +17,7 @@ LAYOUT_DIR="$SCRIPT_DIR/../_layout"
DOWNLOAD_DIR="$SCRIPT_DIR/../_downloads/netcore2x"
PACKAGE_DIR="$SCRIPT_DIR/../_package"
DOTNETSDK_ROOT="$SCRIPT_DIR/../_dotnetsdk"
-DOTNETSDK_VERSION="8.0.425"
-DOTNETSDK_VERSION="8.0.427"
+DOTNETSDK_VERSION="9.0.318"
DOTNETSDK_INSTALLDIR="$DOTNETSDK_ROOT/$DOTNETSDK_VERSION"
RUNNER_VERSION=$(cat runnerversion)

diff --git a/src/global.json b/src/global.json
index 5821cb36..70cfe5c2 100644
index 63e95af8..70cfe5c2 100644
--- a/src/global.json
+++ b/src/global.json
@@ -1,5 +1,5 @@
{
"sdk": {
- "version": "8.0.425"
- "version": "8.0.427"
+ "version": "9.0.318"
}
}
# From upstream commit: 9abfe11d2abd9de09d3a8d933d7ed701ea0518a3
# From upstream commit: 4197182ef8f39c719f66038c1bc9b34cd9e9ac9a
8 changes: 4 additions & 4 deletions patches/runner-main-sdk8-ppc64le.patch
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ index 9c069b12..d26b0dc2 100644
<!-- Set TRACE/DEBUG vars -->
<PropertyGroup>
diff --git a/src/Misc/externals.sh b/src/Misc/externals.sh
index 90978b6d..05ed87f3 100755
index c385c5ef..f708159e 100755
--- a/src/Misc/externals.sh
+++ b/src/Misc/externals.sh
@@ -187,3 +187,13 @@ fi
Expand Down Expand Up @@ -86,7 +86,7 @@ index 14cc6bab..c8ed8b92 100755

if ! [ -x "$(command -v ldconfig)" ]; then
diff --git a/src/Runner.Common/Constants.cs b/src/Runner.Common/Constants.cs
index 4acf4943..5a0d934e 100644
index 3c9a1768..44083c86 100644
--- a/src/Runner.Common/Constants.cs
+++ b/src/Runner.Common/Constants.cs
@@ -59,7 +59,9 @@ namespace GitHub.Runner.Common
Expand Down Expand Up @@ -216,7 +216,7 @@ index 5ad39f3c..183f5ab7 100644
<NoWarn>NU1701;NU1603;NU1603;xUnit2013;SYSLIB0050;SYSLIB0051</NoWarn>
</PropertyGroup>
diff --git a/src/dev.sh b/src/dev.sh
index 5fd2b549..5f751981 100755
index e4e8d10d..073026fe 100755
--- a/src/dev.sh
+++ b/src/dev.sh
@@ -54,6 +54,8 @@ elif [[ "$CURRENT_PLATFORM" == 'linux' ]]; then
Expand Down Expand Up @@ -284,4 +284,4 @@ index 056a312e..3f9a3679 100644
<Exec Command="%22$(DesktopMSBuild)%22 Runner.Service/Windows/RunnerService.csproj /p:Configuration=$(BUILDCONFIG) /p:PackageRuntime=$(PackageRuntime) /p:OutputPath=%22$(MSBuildProjectDirectory)/../_layout/bin%22" ConsoleToMSBuild="true" Condition="'$(PackageRuntime)' == 'win-x64' Or '$(PackageRuntime)' == 'win-x86' Or '$(PackageRuntime)' == 'win-arm64'" />
</Target>

# From upstream commit: 9abfe11d2abd9de09d3a8d933d7ed701ea0518a3
# From upstream commit: 4197182ef8f39c719f66038c1bc9b34cd9e9ac9a
8 changes: 4 additions & 4 deletions patches/runner-main-sdk8-s390x.patch
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ index 9c069b12..d26b0dc2 100644
<!-- Set TRACE/DEBUG vars -->
<PropertyGroup>
diff --git a/src/Misc/externals.sh b/src/Misc/externals.sh
index 90978b6d..05ed87f3 100755
index c385c5ef..f708159e 100755
--- a/src/Misc/externals.sh
+++ b/src/Misc/externals.sh
@@ -187,3 +187,13 @@ fi
Expand Down Expand Up @@ -86,7 +86,7 @@ index 14cc6bab..c8ed8b92 100755

if ! [ -x "$(command -v ldconfig)" ]; then
diff --git a/src/Runner.Common/Constants.cs b/src/Runner.Common/Constants.cs
index 4acf4943..5a0d934e 100644
index 3c9a1768..44083c86 100644
--- a/src/Runner.Common/Constants.cs
+++ b/src/Runner.Common/Constants.cs
@@ -59,7 +59,9 @@ namespace GitHub.Runner.Common
Expand Down Expand Up @@ -216,7 +216,7 @@ index 5ad39f3c..183f5ab7 100644
<NoWarn>NU1701;NU1603;NU1603;xUnit2013;SYSLIB0050;SYSLIB0051</NoWarn>
</PropertyGroup>
diff --git a/src/dev.sh b/src/dev.sh
index 5fd2b549..5f751981 100755
index e4e8d10d..073026fe 100755
--- a/src/dev.sh
+++ b/src/dev.sh
@@ -54,6 +54,8 @@ elif [[ "$CURRENT_PLATFORM" == 'linux' ]]; then
Expand Down Expand Up @@ -284,4 +284,4 @@ index 056a312e..3f9a3679 100644
<Exec Command="%22$(DesktopMSBuild)%22 Runner.Service/Windows/RunnerService.csproj /p:Configuration=$(BUILDCONFIG) /p:PackageRuntime=$(PackageRuntime) /p:OutputPath=%22$(MSBuildProjectDirectory)/../_layout/bin%22" ConsoleToMSBuild="true" Condition="'$(PackageRuntime)' == 'win-x64' Or '$(PackageRuntime)' == 'win-x86' Or '$(PackageRuntime)' == 'win-arm64'" />
</Target>

# From upstream commit: 9abfe11d2abd9de09d3a8d933d7ed701ea0518a3
# From upstream commit: 4197182ef8f39c719f66038c1bc9b34cd9e9ac9a
Loading
Loading