From b319e008313d68f2639de0f656d346ed9a823e41 Mon Sep 17 00:00:00 2001 From: Evgeny Zemtsov Date: Mon, 10 Oct 2022 13:20:56 +0200 Subject: fix(nix/buildkite): split extra steps based on all known phases Fix a bug introduced by 2ca153141 (I merged the wrong patchset). Issue happens when pipeline is split by phases into independent evals (e.g. build/release/deploy). Splitting extra steps requires knowledge of all known phases, otherwise pipeline evaluation fails due to extra steps from inactive phases. Change-Id: Iab0f2dc3eadda281e483055e26f00a95442e15b0 Reviewed-on: https://cl.tvl.fyi/c/depot/+/6942 Tested-by: BuildkiteCI Reviewed-by: tazjin --- nix/buildkite/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/buildkite/default.nix b/nix/buildkite/default.nix index 834e4f7a42aa..f0f760b3ceb1 100644 --- a/nix/buildkite/default.nix +++ b/nix/buildkite/default.nix @@ -197,7 +197,7 @@ rec { # Split extra steps by phase. splitExtraSteps = lib.groupBy ({ phase, ... }: phase) - (attrValues (mapAttrs (normaliseExtraStep enabledPhases overridable) + (attrValues (mapAttrs (normaliseExtraStep phases overridable) (target.meta.ci.extraSteps or { }))); extraSteps = mapAttrs -- cgit 1.4.1