Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: fbbe3f9b7e5d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 40e18bc75e5f
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 15, 2020

  1. Use buildkite agent 3.17.0

    @mrkkrp
    mrkkrp committed Jan 15, 2020
    Copy the full SHA
    24e5a5f View commit details

  2. Make buildkite agent service compatible with buildkite-agent3

    @mrkkrp
    mrkkrp committed Jan 15, 2020
    Copy the full SHA
    a8cdfd3 View commit details

  3. Merge pull request #77773 from mrkkrp/buildkite-agent-fixup 

    Buildkite agent fixup
    @grahamc
    grahamc authored Jan 15, 2020
    Copy the full SHA
    40e18bc View commit details
7 changes: 5 additions & 2 deletions nixos/modules/services/continuous-integration/buildkite-agent.nix
View file
Original file line number Diff line number Diff line change
@@ -210,6 +210,9 @@ in
## don't end up in the Nix store.
preStart = let
sshDir = "${cfg.dataDir}/.ssh";
metaData = if cfg.meta-data == ""
then ""
else "meta-data=${cfg.meta-data}";
in
''
mkdir -m 0700 -p "${sshDir}"
@@ -220,15 +223,15 @@ in
cat > "${cfg.dataDir}/buildkite-agent.cfg" <<EOF
token="$(cat ${toString cfg.tokenPath})"
name="${cfg.name}"
meta-data="${cfg.meta-data}"
${metaData}
build-path="${cfg.dataDir}/builds"
hooks-path="${cfg.hooksPath}"
${cfg.extraConfig}
EOF
'';

serviceConfig =
{ ExecStart = "${pkgs.buildkite-agent}/bin/buildkite-agent start --config /var/lib/buildkite-agent/buildkite-agent.cfg";
{ ExecStart = "${cfg.buildkite-agent}/bin/buildkite-agent start --config /var/lib/buildkite-agent/buildkite-agent.cfg";
User = "buildkite-agent";
RestartSec = 5;
Restart = "on-failure";
4 changes: 2 additions & 2 deletions pkgs/development/tools/continuous-integration/buildkite-agent/3.x.nix
View file
Original file line number Diff line number Diff line change
@@ -5,9 +5,9 @@ callPackage ./generic.nix (args // rec {
owner = "buildkite";
repo = "agent";
rev = "v${version}";
sha256 = "0sr1rxl92d4wdipl66f1yymx5bmyj1y85v6k22v57rzr6yhyfmsf";
sha256 = "0a7x919kxnpdn0pnhc5ilx1z6ninx8zgjvsd0jcg4qwh0qqp5ppr";
};
version = "3.8.4";
version = "3.17.0";
hasBootstrapScript = false;
postPatch = ''
substituteInPlace bootstrap/shell/shell.go --replace /bin/bash ${bash}/bin/bash