From bccb2f7c8435daad2fda86a204bc1fdd0125a485 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 8 Aug 2024 13:21:33 +0300 Subject: [PATCH] buildkite-agent: 3.76.2 -> 3.77.0 We can also drop the workaround included in the bump to 3.76.1, as upstream reverted that behavorial change. --- nixos/doc/manual/release-notes/rl-2411.section.md | 3 --- .../services/continuous-integration/buildkite-agents.nix | 2 -- pkgs/by-name/bu/buildkite-agent/package.nix | 6 +++--- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 0587cd1a295e..2b5e690420d9 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -340,9 +340,6 @@ - `nix.channel.enable = false` no longer implies `nix.settings.nix-path = []`. Since Nix 2.13, a `nix-path` set in `nix.conf` cannot be overriden by the `NIX_PATH` configuration variable. -- Buildkite Agents are now each running in their own private `/tmp`. - To return to the old behaviour, set `systemd.services.buildkite-agent-${name}.serviceConfig.PrivateTmp = false;`. - ## Detailed migration information {#sec-release-24.11-migration} ### `sound` options removal {#sec-release-24.11-migration-sound} diff --git a/nixos/modules/services/continuous-integration/buildkite-agents.nix b/nixos/modules/services/continuous-integration/buildkite-agents.nix index eb7b7a170785..fc30172c6499 100644 --- a/nixos/modules/services/continuous-integration/buildkite-agents.nix +++ b/nixos/modules/services/continuous-integration/buildkite-agents.nix @@ -205,8 +205,6 @@ in serviceConfig = { ExecStart = "${cfg.package}/bin/buildkite-agent start --config ${cfg.dataDir}/buildkite-agent.cfg"; User = "buildkite-agent-${name}"; - # Workaround https://github.com/buildkite/agent/issues/2916 - PrivateTmp = lib.mkDefault true; RestartSec = 5; Restart = "on-failure"; TimeoutSec = 10; diff --git a/pkgs/by-name/bu/buildkite-agent/package.nix b/pkgs/by-name/bu/buildkite-agent/package.nix index 128813f7bea3..8da59b372413 100644 --- a/pkgs/by-name/bu/buildkite-agent/package.nix +++ b/pkgs/by-name/bu/buildkite-agent/package.nix @@ -13,16 +13,16 @@ }: buildGoModule rec { pname = "buildkite-agent"; - version = "3.76.2"; + version = "3.77.0"; src = fetchFromGitHub { owner = "buildkite"; repo = "agent"; rev = "v${version}"; - sha256 = "sha256-XAMrc8HEdCGeI0l6u4n81xhiGkI39b7Poly5CP/b0R8="; + sha256 = "sha256-QsSCIAy0ekkZiqO/cFcPNNkXa3FLL3Z1LJoKsjzB6jw="; }; - vendorHash = "sha256-0P6EXqQa6WxhjNJ4X6THvjJRK/UQvqXTv+7IJViFAQs="; + vendorHash = "sha256-xp836ZT2x20ZbkTEubhiZlLmK9n2F8mCSWZTHmAuu6A="; postPatch = '' substituteInPlace clicommand/agent_start.go --replace /bin/bash ${bash}/bin/bash