diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 016d95e3d65..2add742bf7c 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -25,7 +25,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.17.0"; # Please backport all updates to the stable channel. + version = "5.17.1"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1m3bkrshlipxlbf4xr7gpw3zn1k39cdysrqmw705hy2cwf7pw7yy"; + sha256 = "sha256-gJ5jDMdEx2YSmPtNfv2gKKAgPfRJcb3Aabti/DgHaIU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index e2d40630905..56dfe62042f 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,63 +26,21 @@ 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; + fakeSha1 = "0000000000000000000000000000000000000000"; in stdenv.mkDerivation rec { - inherit pname version; + pname = "github-runner"; + version = "2.282.0"; src = fetchFromGitHub { owner = "actions"; repo = "runner"; - rev = "6b75179ec79e2041b3b5b4e9206b73db2d206aac"; # v${version} - sha256 = "sha256-d7LAHL8Ff7R++d1HuLxWjtiBZRogySe7xHY/xJAcFms="; + rev = "v${version}"; + sha256 = "sha256-381xqBuysT5OR+SDhtSNCz0fOsDM7zC50EatAiXmpHU="; }; nativeBuildInputs = [ @@ -113,8 +68,9 @@ stdenv.mkDerivation rec { ./patches/use-get-directory-for-diag.patch # Don't try to install systemd service ./patches/dont-install-systemd-service.patch - # Don't try to self-update runner (cannot be disabled, see https://github.com/actions/runner/issues/485) - ./patches/ignore-self-update.patch + # Prevent the runner from starting a self-update for new versions + # (upstream issue: https://github.com/actions/runner/issues/485) + ./patches/prevent-self-update.patch ]; postPatch = '' @@ -125,7 +81,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 \ @@ -172,7 +128,7 @@ stdenv.mkDerivation rec { -p:PackageRuntime="${runtimeId}" \ -p:BUILDCONFIG="Release" \ -p:RunnerVersion="${version}" \ - -p:GitInfoCommitHash="${src.rev}" \ + -p:GitInfoCommitHash="${fakeSha1}" \ src/dir.proj runHook postBuild @@ -180,6 +136,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 = '' @@ -194,7 +193,7 @@ stdenv.mkDerivation rec { -p:PackageRuntime="${runtimeId}" \ -p:BUILDCONFIG="Debug" \ -p:RunnerVersion="${version}" \ - -p:GitInfoCommitHash="${src.rev}" \ + -p:GitInfoCommitHash="${fakeSha1}" \ src/dir.proj runHook postCheck @@ -240,6 +239,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 diff --git a/pkgs/development/tools/continuous-integration/github-runner/patches/ignore-self-update.patch b/pkgs/development/tools/continuous-integration/github-runner/patches/ignore-self-update.patch deleted file mode 100644 index b505bbc7503..00000000000 --- a/pkgs/development/tools/continuous-integration/github-runner/patches/ignore-self-update.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/Runner.Listener/Runner.cs b/src/Runner.Listener/Runner.cs -index 68b0b4e..5da21fe 100644 ---- a/src/Runner.Listener/Runner.cs -+++ b/src/Runner.Listener/Runner.cs -@@ -391,18 +391,7 @@ namespace GitHub.Runner.Listener - HostContext.WritePerfCounter($"MessageReceived_{message.MessageType}"); - if (string.Equals(message.MessageType, AgentRefreshMessage.MessageType, StringComparison.OrdinalIgnoreCase)) - { -- if (autoUpdateInProgress == false) -- { -- autoUpdateInProgress = true; -- var runnerUpdateMessage = JsonUtility.FromString(message.Body); -- var selfUpdater = HostContext.GetService(); -- selfUpdateTask = selfUpdater.SelfUpdate(runnerUpdateMessage, jobDispatcher, !runOnce && HostContext.StartupType != StartupType.Service, HostContext.RunnerShutdownToken); -- Trace.Info("Refresh message received, kick-off selfupdate background process."); -- } -- else -- { -- Trace.Info("Refresh message received, skip autoupdate since a previous autoupdate is already running."); -- } -+ Trace.Info("Ignoring received refresh message (would trigger self-update)."); - } - else if (string.Equals(message.MessageType, JobRequestMessageTypes.PipelineAgentJobRequest, StringComparison.OrdinalIgnoreCase)) - { diff --git a/pkgs/development/tools/continuous-integration/github-runner/patches/prevent-self-update.patch b/pkgs/development/tools/continuous-integration/github-runner/patches/prevent-self-update.patch new file mode 100644 index 00000000000..da73cd75a09 --- /dev/null +++ b/pkgs/development/tools/continuous-integration/github-runner/patches/prevent-self-update.patch @@ -0,0 +1,25 @@ +From 8b77c9c61058842e031dd176df2b9c79bc2c0e28 Mon Sep 17 00:00:00 2001 +From: Vincent Haupert +Date: Sun, 12 Sep 2021 19:52:21 +0200 +Subject: [PATCH] Use a fake version to prevent self-update + +--- + src/Runner.Listener/MessageListener.cs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Runner.Listener/MessageListener.cs b/src/Runner.Listener/MessageListener.cs +index 71e5e43..29945e0 100644 +--- a/src/Runner.Listener/MessageListener.cs ++++ b/src/Runner.Listener/MessageListener.cs +@@ -65,7 +65,7 @@ namespace GitHub.Runner.Listener + { + Id = _settings.AgentId, + Name = _settings.AgentName, +- Version = BuildConstants.RunnerPackage.Version, ++ Version = "2.999.9", + OSDescription = RuntimeInformation.OSDescription, + }; + string sessionName = $"{Environment.MachineName ?? "RUNNER"}"; +-- +2.32.0 +