From 9d8c5fee6b5e587a52a9eb39ba84715fcff2ca24 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 4 Jul 2022 03:14:47 +0200 Subject: [PATCH] github-runner: remove nodejs-12_x references --- .../continuous-integration/github-runner/default.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index 5b33c02809eb..1687fb7c52fc 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -19,10 +19,6 @@ , zlib , writeShellApplication , nuget-to-nix -# Keeping this option until upstream removes support for EoL Node.js 12 entirely -# Also refer to: https://github.com/actions/runner/pull/1716 -, withNode12 ? false -, nodejs-12_x }: let nugetSource = linkFarmFromDrvs "nuget-packages" ( @@ -192,9 +188,6 @@ stdenv.mkDerivation rec { ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [ # "JavaScript Actions in Alpine containers are only supported on x64 Linux runners. Detected Linux Arm64" "GitHub.Runner.Common.Tests.Worker.StepHostL0.DetermineNodeRuntimeVersionInAlpineContainerAsync" - ] - ++ lib.optionals (!withNode12) [ - "GitHub.Runner.Common.Tests.ProcessExtensionL0.SuccessReadProcessEnv" ]; checkInputs = [ git ]; @@ -202,7 +195,6 @@ stdenv.mkDerivation rec { runHook preCheck mkdir -p _layout/externals - ${lib.optionalString withNode12 "ln -s ${nodejs-12_x} _layout/externals/node12"} ln -s ${nodejs-16_x} _layout/externals/node16 printf 'Disabled tests:\n%s\n' '${lib.concatMapStringsSep "\n" (x: " - ${x}") disabledTests}' @@ -251,7 +243,6 @@ stdenv.mkDerivation rec { # externals/node{12,16}. As opposed to the official releases, we don't # link the Alpine Node flavors. mkdir -p $out/externals - ${lib.optionalString withNode12 "ln -s ${nodejs-12_x} $out/externals/node12"} ln -s ${nodejs-16_x} $out/externals/node16 # Install Nodejs scripts called from workflows