diff options
| author | Aaron Andersen <aaron@fosslib.net> | 2023-10-26 23:27:51 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-26 23:27:51 -0400 |
| commit | 65f93084d588187d32d48a1c95929e9098e15af3 (patch) | |
| tree | 2fb12626da48d590e046df2d52dc9a5571d7a86b /pkgs/development/tools/continuous-integration | |
| parent | 6fc7203e423bbf1c8f84cccf1c4818d097612566 (diff) | |
| parent | 2b44899a341999ebdb09481b295455e0d4771b43 (diff) | |
| download | nixlib-65f93084d588187d32d48a1c95929e9098e15af3.tar nixlib-65f93084d588187d32d48a1c95929e9098e15af3.tar.gz nixlib-65f93084d588187d32d48a1c95929e9098e15af3.tar.bz2 nixlib-65f93084d588187d32d48a1c95929e9098e15af3.tar.lz nixlib-65f93084d588187d32d48a1c95929e9098e15af3.tar.xz nixlib-65f93084d588187d32d48a1c95929e9098e15af3.tar.zst nixlib-65f93084d588187d32d48a1c95929e9098e15af3.zip | |
Merge pull request #263101 from yaxitech/github-runner-v2.311.0
github-runner: 2.310.2 -> 2.311.0
Diffstat (limited to 'pkgs/development/tools/continuous-integration')
| -rw-r--r-- | pkgs/development/tools/continuous-integration/github-runner/default.nix | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index 528b93798401..57a78dbb3101 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -24,13 +24,13 @@ assert builtins.all (x: builtins.elem x [ "node16" "node20" ]) nodeRuntimes; buildDotnetModule rec { pname = "github-runner"; - version = "2.310.2"; + version = "2.311.0"; src = fetchFromGitHub { owner = "actions"; repo = "runner"; rev = "v${version}"; - hash = "sha256-cOHA4VjccIJmCgCxRrBFzBFnh4SGQ3LpcTvtGuogHQU="; + hash = "sha256-71SwPuX1XZygT/TdAHECudxFxsQuXrl/tcAYVAxfxfI="; leaveDotGit = true; postFetch = '' git -C $out rev-parse --short HEAD > $out/.git-revision @@ -81,6 +81,14 @@ 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 = '' |