mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-18 13:19:10 +03:00
github-runner: remove nodejs-12_x references
This commit is contained in:
parent
2a1a6e5357
commit
9d8c5fee6b
@ -19,10 +19,6 @@
|
|||||||
, zlib
|
, zlib
|
||||||
, writeShellApplication
|
, writeShellApplication
|
||||||
, nuget-to-nix
|
, 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
|
let
|
||||||
nugetSource = linkFarmFromDrvs "nuget-packages" (
|
nugetSource = linkFarmFromDrvs "nuget-packages" (
|
||||||
@ -192,9 +188,6 @@ stdenv.mkDerivation rec {
|
|||||||
++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [
|
++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [
|
||||||
# "JavaScript Actions in Alpine containers are only supported on x64 Linux runners. Detected Linux Arm64"
|
# "JavaScript Actions in Alpine containers are only supported on x64 Linux runners. Detected Linux Arm64"
|
||||||
"GitHub.Runner.Common.Tests.Worker.StepHostL0.DetermineNodeRuntimeVersionInAlpineContainerAsync"
|
"GitHub.Runner.Common.Tests.Worker.StepHostL0.DetermineNodeRuntimeVersionInAlpineContainerAsync"
|
||||||
]
|
|
||||||
++ lib.optionals (!withNode12) [
|
|
||||||
"GitHub.Runner.Common.Tests.ProcessExtensionL0.SuccessReadProcessEnv"
|
|
||||||
];
|
];
|
||||||
checkInputs = [ git ];
|
checkInputs = [ git ];
|
||||||
|
|
||||||
@ -202,7 +195,6 @@ stdenv.mkDerivation rec {
|
|||||||
runHook preCheck
|
runHook preCheck
|
||||||
|
|
||||||
mkdir -p _layout/externals
|
mkdir -p _layout/externals
|
||||||
${lib.optionalString withNode12 "ln -s ${nodejs-12_x} _layout/externals/node12"}
|
|
||||||
ln -s ${nodejs-16_x} _layout/externals/node16
|
ln -s ${nodejs-16_x} _layout/externals/node16
|
||||||
|
|
||||||
printf 'Disabled tests:\n%s\n' '${lib.concatMapStringsSep "\n" (x: " - ${x}") disabledTests}'
|
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
|
# externals/node{12,16}. As opposed to the official releases, we don't
|
||||||
# link the Alpine Node flavors.
|
# link the Alpine Node flavors.
|
||||||
mkdir -p $out/externals
|
mkdir -p $out/externals
|
||||||
${lib.optionalString withNode12 "ln -s ${nodejs-12_x} $out/externals/node12"}
|
|
||||||
ln -s ${nodejs-16_x} $out/externals/node16
|
ln -s ${nodejs-16_x} $out/externals/node16
|
||||||
|
|
||||||
# Install Nodejs scripts called from workflows
|
# Install Nodejs scripts called from workflows
|
||||||
|
Loading…
Reference in New Issue
Block a user