From 0d1e42786e6bc5249248e50793f9f8537aaad857 Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Tue, 7 Sep 2021 15:52:29 +0200 Subject: [PATCH 1/3] github-runner: make derivation easier to override --- .../github-runner/default.nix | 97 +++++++++---------- 1 file changed, 47 insertions(+), 50 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index e2d40630905c..459b68fa6b2b 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -19,9 +19,6 @@ , zlib }: let - pname = "github-actions-runner"; - version = "2.279.0"; - deps = (import ./deps.nix { inherit fetchurl; }); nugetPackages = map (x: { @@ -29,57 +26,14 @@ let path = "${x}"; }) deps; - nugetSource = linkFarm "${pname}-${version}-packages" nugetPackages; + nugetSource = linkFarm "nuget-packages" nugetPackages; dotnetSdk = dotnetCorePackages.sdk_3_1; 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 stdenv.mkDerivation rec { - inherit pname version; + pname = "github-runner"; + version = "2.279.0"; src = fetchFromGitHub { owner = "actions"; @@ -125,7 +79,7 @@ stdenv.mkDerivation rec { # Disable specific tests substituteInPlace src/dir.proj \ --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 substituteInPlace src/dir.proj \ @@ -180,6 +134,49 @@ stdenv.mkDerivation rec { 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 ]; checkPhase = '' From ebcf2468ac67b473821946a6d5539c001861b465 Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Tue, 7 Sep 2021 16:03:38 +0200 Subject: [PATCH 2/3] github-runner: 2.279.0 -> 2.281.1 --- .../tools/continuous-integration/github-runner/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index 459b68fa6b2b..3cfd7d6015a0 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -33,13 +33,13 @@ let in stdenv.mkDerivation rec { pname = "github-runner"; - version = "2.279.0"; + version = "2.281.1"; src = fetchFromGitHub { owner = "actions"; repo = "runner"; - rev = "6b75179ec79e2041b3b5b4e9206b73db2d206aac"; # v${version} - sha256 = "sha256-d7LAHL8Ff7R++d1HuLxWjtiBZRogySe7xHY/xJAcFms="; + rev = "c8caf59bb7adaa87c4cf8f61372670d338a13f2d"; # v${version} + sha256 = "sha256-Nl1FSjwweVqdQEVhqt4PEcqZbF7htNT279yx1nGuAe0="; }; nativeBuildInputs = [ From 1614fc6eb63d012b704cbb34b9c53c823d51c32c Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Tue, 7 Sep 2021 16:16:29 +0200 Subject: [PATCH 3/3] github-runner: adapt to latest lttng-ust ref: ab2501bd171f2c930ebd3f3bf6b6a1a228477a08 --- .../tools/continuous-integration/github-runner/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index 3cfd7d6015a0..b7da1970da2b 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -237,6 +237,10 @@ stdenv.mkDerivation rec { # Stripping breaks the binaries dontStrip = true; + preFixup = '' + patchelf --replace-needed liblttng-ust.so.0 liblttng-ust.so $out/lib/libcoreclrtraceptprovider.so + ''; + postFixup = '' fix_rpath() { patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/lib/$1