JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #136988 from veehaitch/github-runner-override-opts

Browse Source 
github-runner: 2.279.0 -> 2.281.1
This commit is contained in:
Jörg Thalheim 2021-09-09 08:35:51 +01:00 committed by GitHub
commit c4c70b389d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 53 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,9 +19,6 @@
, zlib , zlib
}: }:
let let
pname = "github-actions-runner";
version = "2.279.0";
deps = (import ./deps.nix { inherit fetchurl; }); deps = (import ./deps.nix { inherit fetchurl; });
nugetPackages = map nugetPackages = map
(x: { (x: {
@ -29,63 +26,20 @@ let
path = "${x}"; path = "${x}";
}) })
deps; deps;
nugetSource = linkFarm "${pname}-${version}-packages" nugetPackages; nugetSource = linkFarm "nuget-packages" nugetPackages;
dotnetSdk = dotnetCorePackages.sdk_3_1; dotnetSdk = dotnetCorePackages.sdk_3_1;
runtimeId = "linux-x64"; runtimeId = "linux-x64";
disabledTest = [
# Self-updating is patched out, hence this test will fail
"FullyQualifiedName!=GitHub.Runner.Common.Tests.Listener.RunnerL0.TestRunOnceHandleUpdateMessage"
] ++ map
# Online tests
(x: "FullyQualifiedName!=GitHub.Runner.Common.Tests.Worker.ActionManagerL0.PrepareActions_${x}")
[
"CompositeActionWithActionfile_CompositeContainerNested"
"CompositeActionWithActionfile_CompositePrestepNested"
"CompositeActionWithActionfile_MaxLimit"
"CompositeActionWithActionfile_Node"
"DownloadActionFromGraph"
"DownloadActionFromGraph_Legacy"
"NotPullOrBuildImagesMultipleTimes"
"NotPullOrBuildImagesMultipleTimes_Legacy"
"RepositoryActionWithActionYamlFile_DockerHubImage"
"RepositoryActionWithActionYamlFile_DockerHubImage_Legacy"
"RepositoryActionWithActionfileAndDockerfile"
"RepositoryActionWithActionfileAndDockerfile_Legacy"
"RepositoryActionWithActionfile_DockerHubImage"
"RepositoryActionWithActionfile_DockerHubImage_Legacy"
"RepositoryActionWithActionfile_Dockerfile"
"RepositoryActionWithActionfile_Dockerfile_Legacy"
"RepositoryActionWithActionfile_DockerfileRelativePath"
"RepositoryActionWithActionfile_DockerfileRelativePath_Legacy"
"RepositoryActionWithActionfile_Node"
"RepositoryActionWithActionfile_Node_Legacy"
"RepositoryActionWithDockerfile"
"RepositoryActionWithDockerfile_Legacy"
"RepositoryActionWithDockerfileInRelativePath"
"RepositoryActionWithDockerfileInRelativePath_Legacy"
"RepositoryActionWithDockerfilePrepareActions_Repository"
"RepositoryActionWithInvalidWrapperActionfile_Node"
"RepositoryActionWithInvalidWrapperActionfile_Node_Legacy"
"RepositoryActionWithWrapperActionfile_PreSteps"
"RepositoryActionWithWrapperActionfile_PreSteps_Legacy"
] ++ map
(x: "FullyQualifiedName!=GitHub.Runner.Common.Tests.DotnetsdkDownloadScriptL0.${x}")
[
"EnsureDotnetsdkBashDownloadScriptUpToDate"
"EnsureDotnetsdkPowershellDownloadScriptUpToDate"
];
testFilterXml = lib.concatStringsSep "&" disabledTest;
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
inherit pname version; pname = "github-runner";
version = "2.281.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "actions"; owner = "actions";
repo = "runner"; repo = "runner";
rev = "6b75179ec79e2041b3b5b4e9206b73db2d206aac"; # v${version} rev = "c8caf59bb7adaa87c4cf8f61372670d338a13f2d"; # v${version}
sha256 = "sha256-d7LAHL8Ff7R++d1HuLxWjtiBZRogySe7xHY/xJAcFms="; sha256 = "sha256-Nl1FSjwweVqdQEVhqt4PEcqZbF7htNT279yx1nGuAe0=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -125,7 +79,7 @@ stdenv.mkDerivation rec {
# Disable specific tests # Disable specific tests
substituteInPlace src/dir.proj \ substituteInPlace src/dir.proj \
--replace 'dotnet test Test/Test.csproj' \ --replace 'dotnet test Test/Test.csproj' \
"dotnet test Test/Test.csproj --filter '${testFilterXml}'" "dotnet test Test/Test.csproj --filter '${lib.concatStringsSep "&" disabledTests}'"
# We don't use a Git checkout # We don't use a Git checkout
substituteInPlace src/dir.proj \ substituteInPlace src/dir.proj \
@ -180,6 +134,49 @@ stdenv.mkDerivation rec {
doCheck = true; doCheck = true;
disabledTests = [
# Self-updating is patched out, hence this test will fail
"FullyQualifiedName!=GitHub.Runner.Common.Tests.Listener.RunnerL0.TestRunOnceHandleUpdateMessage"
] ++ map
# Online tests
(x: "FullyQualifiedName!=GitHub.Runner.Common.Tests.Worker.ActionManagerL0.PrepareActions_${x}")
[
"CompositeActionWithActionfile_CompositeContainerNested"
"CompositeActionWithActionfile_CompositePrestepNested"
"CompositeActionWithActionfile_MaxLimit"
"CompositeActionWithActionfile_Node"
"DownloadActionFromGraph"
"DownloadActionFromGraph_Legacy"
"NotPullOrBuildImagesMultipleTimes"
"NotPullOrBuildImagesMultipleTimes_Legacy"
"RepositoryActionWithActionYamlFile_DockerHubImage"
"RepositoryActionWithActionYamlFile_DockerHubImage_Legacy"
"RepositoryActionWithActionfileAndDockerfile"
"RepositoryActionWithActionfileAndDockerfile_Legacy"
"RepositoryActionWithActionfile_DockerHubImage"
"RepositoryActionWithActionfile_DockerHubImage_Legacy"
"RepositoryActionWithActionfile_Dockerfile"
"RepositoryActionWithActionfile_Dockerfile_Legacy"
"RepositoryActionWithActionfile_DockerfileRelativePath"
"RepositoryActionWithActionfile_DockerfileRelativePath_Legacy"
"RepositoryActionWithActionfile_Node"
"RepositoryActionWithActionfile_Node_Legacy"
"RepositoryActionWithDockerfile"
"RepositoryActionWithDockerfile_Legacy"
"RepositoryActionWithDockerfileInRelativePath"
"RepositoryActionWithDockerfileInRelativePath_Legacy"
"RepositoryActionWithDockerfilePrepareActions_Repository"
"RepositoryActionWithInvalidWrapperActionfile_Node"
"RepositoryActionWithInvalidWrapperActionfile_Node_Legacy"
"RepositoryActionWithWrapperActionfile_PreSteps"
"RepositoryActionWithWrapperActionfile_PreSteps_Legacy"
] ++ map
(x: "FullyQualifiedName!=GitHub.Runner.Common.Tests.DotnetsdkDownloadScriptL0.${x}")
[
"EnsureDotnetsdkBashDownloadScriptUpToDate"
"EnsureDotnetsdkPowershellDownloadScriptUpToDate"
];
checkInputs = [ git ]; checkInputs = [ git ];
checkPhase = '' checkPhase = ''
@ -240,6 +237,10 @@ stdenv.mkDerivation rec {
# Stripping breaks the binaries # Stripping breaks the binaries
dontStrip = true; dontStrip = true;
preFixup = ''
patchelf --replace-needed liblttng-ust.so.0 liblttng-ust.so $out/lib/libcoreclrtraceptprovider.so
'';
postFixup = '' postFixup = ''
fix_rpath() { fix_rpath() {
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/lib/$1 patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/lib/$1