From 3ed14201a46ae5ab4e30df4c5bce30340eb7794b Mon Sep 17 00:00:00 2001 From: florentianayuwono Date: Wed, 28 Oct 2026 03:10:37 +0700 Subject: [PATCH] Sync release patch v2.338.2 Rebases runner-sdk8-{ppc64le,s390x,arm}.patch from v2.338.0 to v2.338.2. The automated patch_update_release.yml workflow run failed on the arm leg because upstream bumped the pinned .NET SDK version in src/dev.sh and src/global.json (8.0.425 -> 8.0.427), conflicting with our intentional .NET 9 pin (9.0.318, from PR #209, Y2038 SSL fix). Manually resolved by keeping our 9.0.318 pin; ppc64le/s390x rebased cleanly. Validated: all three patches apply cleanly to a fresh v2.338.2 checkout, and ./dev.sh test passes 1171/1172 (same pre-existing unrelated ProcessExtensionL0.SuccessReadProcessEnv failure). Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- patches/last_processed_tag.txt | 2 +- patches/runner-sdk8-arm.patch | 20 ++++++++++---------- patches/runner-sdk8-ppc64le.patch | 8 ++++---- patches/runner-sdk8-s390x.patch | 8 ++++---- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/patches/last_processed_tag.txt b/patches/last_processed_tag.txt index 82c74efcb44..360c102ae1f 100644 --- a/patches/last_processed_tag.txt +++ b/patches/last_processed_tag.txt @@ -1 +1 @@ -v2.338.0 +v2.338.2 diff --git a/patches/runner-sdk8-arm.patch b/patches/runner-sdk8-arm.patch index a46c2d69a46..ed81dc5e5c8 100644 --- a/patches/runner-sdk8-arm.patch +++ b/patches/runner-sdk8-arm.patch @@ -1,5 +1,5 @@ diff --git a/src/Misc/externals.sh b/src/Misc/externals.sh -index 90978b6d..ee3fd607 100755 +index c385c5ef..6d42de8f 100755 --- a/src/Misc/externals.sh +++ b/src/Misc/externals.sh @@ -4,6 +4,9 @@ PRECACHE=$2 @@ -44,7 +44,7 @@ index 4acf4943..97d3dd87 100644 public static readonly string Node20DeprecationUrl = "https://github.blog/changelog/2025-09-19-deprecation-of-node-20-on-github-actions-runners/"; diff --git a/src/Runner.Common/Runner.Common.csproj b/src/Runner.Common/Runner.Common.csproj -index 4ed18b2b..e0c88fbc 100644 +index 9c087c87..f6e576b2 100644 --- a/src/Runner.Common/Runner.Common.csproj +++ b/src/Runner.Common/Runner.Common.csproj @@ -1,7 +1,7 @@ @@ -146,7 +146,7 @@ index 7b8055b9..584e654a 100644 } } diff --git a/src/Runner.Listener/Runner.Listener.csproj b/src/Runner.Listener/Runner.Listener.csproj -index d2b1060d..d7119171 100644 +index b5325000..7244b10f 100644 --- a/src/Runner.Listener/Runner.Listener.csproj +++ b/src/Runner.Listener/Runner.Listener.csproj @@ -1,7 +1,7 @@ @@ -245,7 +245,7 @@ index 8044f091..d1f341ed 100644 // Action is still running on node20 (general case) executionContext.Global.DeprecatedNode20Actions?.Add(actionName); diff --git a/src/Runner.Worker/Runner.Worker.csproj b/src/Runner.Worker/Runner.Worker.csproj -index 03290778..efd2b8cd 100644 +index 6a7f36ef..511aa2f5 100644 --- a/src/Runner.Worker/Runner.Worker.csproj +++ b/src/Runner.Worker/Runner.Worker.csproj @@ -1,7 +1,7 @@ @@ -258,7 +258,7 @@ index 03290778..efd2b8cd 100644 win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64 true diff --git a/src/Sdk/Sdk.csproj b/src/Sdk/Sdk.csproj -index e6ba57af..0b5b1d62 100644 +index 45c8f8f1..af30eb04 100644 --- a/src/Sdk/Sdk.csproj +++ b/src/Sdk/Sdk.csproj @@ -1,7 +1,7 @@ @@ -599,27 +599,27 @@ index 843071c8..1cd9aa28 100644 true NU1701;NU1603;NU1603;xUnit2013;SYSLIB0050;SYSLIB0051 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 release: v2.338.0 +# From upstream release: v2.338.2 diff --git a/patches/runner-sdk8-ppc64le.patch b/patches/runner-sdk8-ppc64le.patch index 511860e02c1..eab2de755f0 100644 --- a/patches/runner-sdk8-ppc64le.patch +++ b/patches/runner-sdk8-ppc64le.patch @@ -16,7 +16,7 @@ index 9c069b12..d26b0dc2 100644 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 @@ -127,7 +127,7 @@ index 97273a1a..78f78701 100644 throw new NotSupportedException(); // Should never reach here. } diff --git a/src/Sdk/Sdk.csproj b/src/Sdk/Sdk.csproj -index e6ba57af..fc8b3d34 100644 +index 45c8f8f1..bb7640ac 100644 --- a/src/Sdk/Sdk.csproj +++ b/src/Sdk/Sdk.csproj @@ -4,7 +4,7 @@ @@ -216,7 +216,7 @@ index 843071c8..40407c7f 100644 NU1701;NU1603;NU1603;xUnit2013;SYSLIB0050;SYSLIB0051 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 @@ -284,4 +284,4 @@ index 056a312e..3f9a3679 100644 -# From upstream release: v2.338.0 +# From upstream release: v2.338.2 diff --git a/patches/runner-sdk8-s390x.patch b/patches/runner-sdk8-s390x.patch index 7bdf87c8bd6..e5dc031c021 100644 --- a/patches/runner-sdk8-s390x.patch +++ b/patches/runner-sdk8-s390x.patch @@ -16,7 +16,7 @@ index 9c069b12..d26b0dc2 100644 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 @@ -127,7 +127,7 @@ index 97273a1a..78f78701 100644 throw new NotSupportedException(); // Should never reach here. } diff --git a/src/Sdk/Sdk.csproj b/src/Sdk/Sdk.csproj -index e6ba57af..fc8b3d34 100644 +index 45c8f8f1..bb7640ac 100644 --- a/src/Sdk/Sdk.csproj +++ b/src/Sdk/Sdk.csproj @@ -4,7 +4,7 @@ @@ -216,7 +216,7 @@ index 843071c8..40407c7f 100644 NU1701;NU1603;NU1603;xUnit2013;SYSLIB0050;SYSLIB0051 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 @@ -284,4 +284,4 @@ index 056a312e..3f9a3679 100644 -# From upstream release: v2.338.0 +# From upstream release: v2.338.2