Skip to content

Commit

Permalink
github-runner: 2.320.0 -> 2.321.0
Browse files Browse the repository at this point in the history
* remove mentions of Node.js 16 which is not supported anymore
  see actions/runner#3503
* switch to .Net SDK 8
  see actions/runner#3500
* fix source path discovery in deterministic build: runtime assumes that
  the root of the project is `/_`, replace it with actual `/build/src`
  so that tests can find their data.

(cherry picked from commit db1d5cf)
(cherry picked from commit 2c6e9e4)
  • Loading branch information
YorikSar authored and osnyx committed Nov 25, 2024
1 parent 7aae423 commit e836880
Show file tree
Hide file tree
Showing 3 changed files with 226 additions and 282 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ assert builtins.all (x: builtins.elem x [ "node20" ]) nodeRuntimes;

buildDotnetModule rec {
pname = "github-runner";
version = "2.320.0";
version = "2.321.0";

src = fetchFromGitHub {
owner = "actions";
repo = "runner";
rev = "v${version}";
hash = "sha256-mVi/Z89R2nbxQAyEkpbcaU3Pc3wK6989QojHew9ad4g=";
hash = "sha256-KZ072v5kYlD78RGQl13Aj05DGzj2+r2akzyZ1aJn93A=";
leaveDotGit = true;
postFetch = ''
git -C $out rev-parse --short HEAD > $out/.git-revision
Expand Down Expand Up @@ -80,19 +80,16 @@ buildDotnetModule rec {
url = "https://github.com/actions/runner/commit/5ff0ce1.patch";
hash = "sha256-2Vg3cKZK3cE/OcPDZkdN2Ro2WgvduYTTwvNGxwCfXas=";
})
# Fix source path discovery in tests
./patches/test-getsrcpath.patch
];

postPatch =
''
# Ignore changes to src/Runner.Sdk/BuildConstants.cs
substituteInPlace src/dir.proj \
--replace 'git update-index --assume-unchanged ./Runner.Sdk/BuildConstants.cs' \
'true'
''
+ lib.optionalString (nodeRuntimes == [ "node20" ]) ''
substituteInPlace src/Runner.Common/Util/NodeUtil.cs \
--replace-fail '_defaultNodeVersion = "node16"' '_defaultNodeVersion = "node20"'
'';
postPatch = ''
# Ignore changes to src/Runner.Sdk/BuildConstants.cs
substituteInPlace src/dir.proj \
--replace-fail 'git update-index --assume-unchanged ./Runner.Sdk/BuildConstants.cs' \
'true'
'';

DOTNET_SYSTEM_GLOBALIZATION_INVARIANT = isNull glibcLocales;
LOCALE_ARCHIVE = lib.optionalString (
Expand Down Expand Up @@ -121,8 +118,8 @@ buildDotnetModule rec {

buildInputs = [ stdenv.cc.cc.lib ];

dotnet-sdk = dotnetCorePackages.sdk_6_0;
dotnet-runtime = dotnetCorePackages.runtime_6_0;
dotnet-sdk = dotnetCorePackages.sdk_8_0;
dotnet-runtime = dotnetCorePackages.runtime_8_0;

dotnetFlags = [
"-p:PackageRuntime=${dotnetCorePackages.systemToDotnetRid stdenv.hostPlatform.system}"
Expand Down Expand Up @@ -206,8 +203,6 @@ buildDotnetModule rec {
"GitHub.Runner.Common.Tests.Worker.VariablesL0.Constructor_SetsOrdinalIgnoreCaseComparer"
"GitHub.Runner.Common.Tests.Worker.WorkerL0.DispatchCancellation"
"GitHub.Runner.Common.Tests.Worker.WorkerL0.DispatchRunNewJob"
]
++ lib.optionals (!lib.elem "node16" nodeRuntimes) [
"GitHub.Runner.Common.Tests.ProcessExtensionL0.SuccessReadProcessEnv"
];

Expand Down
Loading

0 comments on commit e836880

Please sign in to comment.