[24.05] github-runner: 2.319.1 -> 2.320.0

pkgs/development/tools/continuous-integration/github-runner/default.nix

@@ -1,34 +1,35 @@
-{ autoSignDarwinBinariesHook
-, buildDotnetModule
-, dotnetCorePackages
-, fetchFromGitHub
-, fetchpatch
-, git
-, glibc
-, glibcLocales
-, lib
-, nixosTests
-, stdenv
-, which
-, buildPackages
-, runtimeShell
+{
+  autoSignDarwinBinariesHook,
+  buildDotnetModule,
+  dotnetCorePackages,
+  fetchFromGitHub,
+  fetchpatch,
+  git,
+  glibc,
+  glibcLocales,
+  lib,
+  nixosTests,
+  stdenv,
+  which,
+  buildPackages,
+  runtimeShell,
   # List of Node.js runtimes the package should support
-, nodeRuntimes ? [ "node20" ]
-, nodejs_20
+  nodeRuntimes ? [ "node20" ],
+  nodejs_20,
 }:
 
 # Node.js runtimes supported by upstream
 assert builtins.all (x: builtins.elem x [ "node20" ]) nodeRuntimes;
 
 buildDotnetModule rec {
   pname = "github-runner";
-  version = "2.319.1";
+  version = "2.320.0";
 
   src = fetchFromGitHub {
     owner = "actions";
     repo = "runner";
     rev = "v${version}";
-    hash = "sha256-cXOYW4py2RRJVUKrQBGf6LHNyc1sJ/bMR4hJxtDv3PU=";
+    hash = "sha256-mVi/Z89R2nbxQAyEkpbcaU3Pc3wK6989QojHew9ad4g=";
     leaveDotGit = true;
     postFetch = ''
       git -C $out rev-parse --short HEAD > $out/.git-revision
@@ -79,25 +80,24 @@ buildDotnetModule rec {
       url = "https://github.com/actions/runner/commit/5ff0ce1.patch";
       hash = "sha256-2Vg3cKZK3cE/OcPDZkdN2Ro2WgvduYTTwvNGxwCfXas=";
     })
-  ] ++ lib.optionals (nodeRuntimes == [ "node20" ]) [
-    # If the package is built without Node 16, make Node 20 the default internal version
-    # https://github.com/actions/runner/pull/2844
-    (fetchpatch {
-      name = "internal-node-20.patch";
-      url = "https://github.com/actions/runner/commit/acdc6ed.patch";
-      hash = "sha256-3/6yhhJPr9OMWBFc5/NU/DRtn76aTYvjsjQo2u9ZqnU=";
-    })
   ];
 
-  postPatch = ''
-    # Ignore changes to src/Runner.Sdk/BuildConstants.cs
-    substituteInPlace src/dir.proj \
-      --replace 'git update-index --assume-unchanged ./Runner.Sdk/BuildConstants.cs' \
-                'true'
-  '';
+  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"'
+    '';
 
   DOTNET_SYSTEM_GLOBALIZATION_INVARIANT = isNull glibcLocales;
-  LOCALE_ARCHIVE = lib.optionalString (!DOTNET_SYSTEM_GLOBALIZATION_INVARIANT) "${glibcLocales}/lib/locale/locale-archive";
+  LOCALE_ARCHIVE = lib.optionalString (
+    !DOTNET_SYSTEM_GLOBALIZATION_INVARIANT
+  ) "${glibcLocales}/lib/locale/locale-archive";
 
   postConfigure = ''
     # Generate src/Runner.Sdk/BuildConstants.cs
@@ -110,19 +110,23 @@ buildDotnetModule rec {
       src/dir.proj
   '';
 
-  nativeBuildInputs = [
-    which
-    git
-  ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
-    autoSignDarwinBinariesHook
-  ];
+  nativeBuildInputs =
+    [
+      which
+      git
+    ]
+    ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
+      autoSignDarwinBinariesHook
+    ];
 
   buildInputs = [ stdenv.cc.cc.lib ];
 
   dotnet-sdk = dotnetCorePackages.sdk_6_0;
   dotnet-runtime = dotnetCorePackages.runtime_6_0;
 
-  dotnetFlags = [ "-p:PackageRuntime=${dotnetCorePackages.systemToDotnetRid stdenv.hostPlatform.system}" ];
+  dotnetFlags = [
+    "-p:PackageRuntime=${dotnetCorePackages.systemToDotnetRid stdenv.hostPlatform.system}"
+  ];
 
   # As given here: https://github.com/actions/runner/blob/0befa62/src/dir.proj#L33-L41
   projectFile = [
@@ -209,70 +213,79 @@ buildDotnetModule rec {
 
   testProjectFile = [ "src/Test/Test.csproj" ];
 
-  preCheck = ''
-    mkdir -p _layout/externals
-  '' + lib.optionalString (lib.elem "node20" nodeRuntimes) ''
-    ln -s ${nodejs_20} _layout/externals/node20
-  '';
+  preCheck =
+    ''
+      mkdir -p _layout/externals
+    ''
+    + lib.optionalString (lib.elem "node20" nodeRuntimes) ''
+      ln -s ${nodejs_20} _layout/externals/node20
+    '';
 
-  postInstall = ''
-    mkdir -p $out/bin
-
-    install -m755 src/Misc/layoutbin/runsvc.sh                 $out/lib/github-runner
-    install -m755 src/Misc/layoutbin/RunnerService.js          $out/lib/github-runner
-    install -m755 src/Misc/layoutroot/run.sh                   $out/lib/github-runner
-    install -m755 src/Misc/layoutroot/run-helper.sh.template   $out/lib/github-runner/run-helper.sh
-    install -m755 src/Misc/layoutroot/config.sh                $out/lib/github-runner
-    install -m755 src/Misc/layoutroot/env.sh                   $out/lib/github-runner
-
-    # env.sh is patched to not require any wrapping
-    ln -sr "$out/lib/github-runner/env.sh" "$out/bin/"
-
-    substituteInPlace $out/lib/github-runner/config.sh \
-      --replace './bin/Runner.Listener' "$out/bin/Runner.Listener"
-  '' + lib.optionalString stdenv.isLinux ''
-    substituteInPlace $out/lib/github-runner/config.sh \
-      --replace 'command -v ldd' 'command -v ${glibc.bin}/bin/ldd' \
-      --replace 'ldd ./bin' '${glibc.bin}/bin/ldd ${dotnet-runtime}/shared/Microsoft.NETCore.App/${dotnet-runtime.version}/' \
-      --replace '/sbin/ldconfig' '${glibc.bin}/bin/ldconfig'
-  '' + ''
-    # Remove uneeded copy for run-helper template
-    substituteInPlace $out/lib/github-runner/run.sh --replace 'cp -f "$DIR"/run-helper.sh.template "$DIR"/run-helper.sh' ' '
-    substituteInPlace $out/lib/github-runner/run-helper.sh --replace '"$DIR"/bin/' '"$DIR"/'
-
-    # Make paths absolute
-    substituteInPlace $out/lib/github-runner/runsvc.sh \
-      --replace './externals' "$out/lib/externals" \
-      --replace './bin/RunnerService.js' "$out/lib/github-runner/RunnerService.js"
-
-    # The upstream package includes Node and expects it at the path
-    # externals/node$version. As opposed to the official releases, we don't
-    # link the Alpine Node flavors.
-    mkdir -p $out/lib/externals
-  '' + lib.optionalString (lib.elem "node20" nodeRuntimes) ''
-    ln -s ${nodejs_20} $out/lib/externals/node20
-  '' + ''
-    # Install Nodejs scripts called from workflows
-    install -D src/Misc/layoutbin/hashFiles/index.js $out/lib/github-runner/hashFiles/index.js
-    mkdir -p $out/lib/github-runner/checkScripts
-    install src/Misc/layoutbin/checkScripts/* $out/lib/github-runner/checkScripts/
-  '' + lib.optionalString stdenv.isLinux ''
-    # Wrap explicitly to, e.g., prevent extra entries for LD_LIBRARY_PATH
-    makeWrapperArgs=()
-
-    # We don't wrap with libicu
-    substituteInPlace $out/lib/github-runner/config.sh \
-      --replace '$LDCONFIG_COMMAND -NXv ''${libpath//:/ }' 'echo libicu'
-  '' + ''
-    # XXX: Using the corresponding Nix argument does not work as expected:
-    #      https://github.com/NixOS/nixpkgs/issues/218449
-    # Common wrapper args for `executables`
-    makeWrapperArgs+=(
-      --run 'export RUNNER_ROOT="''${RUNNER_ROOT:-"$HOME/.github-runner"}"'
-      --run 'mkdir -p "$RUNNER_ROOT"'
-      --chdir "$out"
-    )
-  '';
+  postInstall =
+    ''
+      mkdir -p $out/bin
+
+      install -m755 src/Misc/layoutbin/runsvc.sh                 $out/lib/github-runner
+      install -m755 src/Misc/layoutbin/RunnerService.js          $out/lib/github-runner
+      install -m755 src/Misc/layoutroot/run.sh                   $out/lib/github-runner
+      install -m755 src/Misc/layoutroot/run-helper.sh.template   $out/lib/github-runner/run-helper.sh
+      install -m755 src/Misc/layoutroot/config.sh                $out/lib/github-runner
+      install -m755 src/Misc/layoutroot/env.sh                   $out/lib/github-runner
+
+      # env.sh is patched to not require any wrapping
+      ln -sr "$out/lib/github-runner/env.sh" "$out/bin/"
+
+      substituteInPlace $out/lib/github-runner/config.sh \
+        --replace './bin/Runner.Listener' "$out/bin/Runner.Listener"
+    ''
+    + lib.optionalString stdenv.isLinux ''
+      substituteInPlace $out/lib/github-runner/config.sh \
+        --replace 'command -v ldd' 'command -v ${glibc.bin}/bin/ldd' \
+        --replace 'ldd ./bin' '${glibc.bin}/bin/ldd ${dotnet-runtime}/shared/Microsoft.NETCore.App/${dotnet-runtime.version}/' \
+        --replace '/sbin/ldconfig' '${glibc.bin}/bin/ldconfig'
+    ''
+    + ''
+      # Remove uneeded copy for run-helper template
+      substituteInPlace $out/lib/github-runner/run.sh --replace 'cp -f "$DIR"/run-helper.sh.template "$DIR"/run-helper.sh' ' '
+      substituteInPlace $out/lib/github-runner/run-helper.sh --replace '"$DIR"/bin/' '"$DIR"/'
+
+      # Make paths absolute
+      substituteInPlace $out/lib/github-runner/runsvc.sh \
+        --replace './externals' "$out/lib/externals" \
+        --replace './bin/RunnerService.js' "$out/lib/github-runner/RunnerService.js"
+
+      # The upstream package includes Node and expects it at the path
+      # externals/node$version. As opposed to the official releases, we don't
+      # link the Alpine Node flavors.
+      mkdir -p $out/lib/externals
+    ''
+    + lib.optionalString (lib.elem "node20" nodeRuntimes) ''
+      ln -s ${nodejs_20} $out/lib/externals/node20
+    ''
+    + ''
+      # Install Nodejs scripts called from workflows
+      install -D src/Misc/layoutbin/hashFiles/index.js $out/lib/github-runner/hashFiles/index.js
+      mkdir -p $out/lib/github-runner/checkScripts
+      install src/Misc/layoutbin/checkScripts/* $out/lib/github-runner/checkScripts/
+    ''
+    + lib.optionalString stdenv.isLinux ''
+      # Wrap explicitly to, e.g., prevent extra entries for LD_LIBRARY_PATH
+      makeWrapperArgs=()
+
+      # We don't wrap with libicu
+      substituteInPlace $out/lib/github-runner/config.sh \
+        --replace '$LDCONFIG_COMMAND -NXv ''${libpath//:/ }' 'echo libicu'
+    ''
+    + ''
+      # XXX: Using the corresponding Nix argument does not work as expected:
+      #      https://github.com/NixOS/nixpkgs/issues/218449
+      # Common wrapper args for `executables`
+      makeWrapperArgs+=(
+        --run 'export RUNNER_ROOT="''${RUNNER_ROOT:-"$HOME/.github-runner"}"'
+        --run 'mkdir -p "$RUNNER_ROOT"'
+        --chdir "$out"
+      )
+    '';
 
   # List of files to wrap
   executables = [
@@ -318,8 +331,19 @@ buildDotnetModule rec {
     description = "Self-hosted runner for GitHub Actions";
     homepage = "https://github.com/actions/runner";
     license = licenses.mit;
-    maintainers = with maintainers; [ veehaitch newam kfollesdal aanderse zimbatm ];
-    platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
+    maintainers = with maintainers; [
+      veehaitch
+      newam
+      kfollesdal
+      aanderse
+      zimbatm
+    ];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+      "x86_64-darwin"
+      "aarch64-darwin"
+    ];
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
   };
 }