diff options
Diffstat (limited to 'nix')
| -rw-r--r-- | nix/buildkite/default.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/nix/buildkite/default.nix b/nix/buildkite/default.nix index 078b91094d11..5c46dcb33389 100644 --- a/nix/buildkite/default.nix +++ b/nix/buildkite/default.nix @@ -396,10 +396,6 @@ rec { (buildEnabled && !cfg.alwaysRun && !cfg.needsOutput) cfg.parent.key; - branches = - if cfg.branches != null - then lib.concatStringsSep " " cfg.branches else null; - command = pkgs.writeShellScript "${cfg.key}-script" '' set -ueo pipefail ${lib.optionalString cfg.needsOutput @@ -409,7 +405,10 @@ rec { echo '+++ Running extra step command' exec ${cfg.command} ''; - } // (lib.optionalAttrs (cfg.agents != null) { inherit (cfg) agents; }); + } // (lib.optionalAttrs (cfg.agents != null) { inherit (cfg) agents; }) + // (lib.optionalAttrs (cfg.branches != null) { + branches = lib.concatStringsSep " " cfg.branches; + }); in if (isString cfg.prompt) then |