diff options
| author | Vincent Ambo <mail@tazj.in> | 2022-01-01T15·37+0300 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2022-01-02T22·25+0000 |
| commit | 4ab061ed988577fcb64e8927b2331346202ee32c (patch) | |
| tree | cb6abb62e69ebbe91bb6dc95c23dbc1baad38d80 | |
| parent | 5a6f984222d37e50c8d7c06415ba48e66f45b4ed (diff) | |
fix(ops/pipelines): Realise anchor derivation for rooting r/3512
Turns the anchor derivation into something that can actually be built (a call creating a propagated build inputs file), and builds it. This should fix the anchoring logic we have on canon. Change-Id: If6a7662b82e2e396388980f65e332cf67a45b46e Reviewed-on: https://cl.tvl.fyi/c/depot/+/4763 Tested-by: BuildkiteCI Autosubmit: tazjin <mail@tazj.in> Reviewed-by: sterni <sternenseemann@systemli.org>
| -rw-r--r-- | default.nix | 6 | ||||
| -rw-r--r-- | ops/pipelines/static-pipeline.yaml | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/default.nix b/default.nix index fd02dfbde927..1cf62e94afb0 100644 --- a/default.nix +++ b/default.nix @@ -108,8 +108,8 @@ in readTree.fix(self: (readDepot { }); # Derivation that gcroots all depot targets. - ci.gcroot = self.third_party.nixpkgs.symlinkJoin { + ci.gcroot = with self.third_party.nixpkgs; makeSetupHook { name = "depot-gcroot"; - paths = self.ci.targets; - }; + deps = self.ci.targets; + } emptyFile; }) diff --git a/ops/pipelines/static-pipeline.yaml b/ops/pipelines/static-pipeline.yaml index 872a6c5d27a7..dbac741adb1e 100644 --- a/ops/pipelines/static-pipeline.yaml +++ b/ops/pipelines/static-pipeline.yaml @@ -66,7 +66,7 @@ steps: - label: ":anchor:" if: "build.branch == 'refs/heads/canon'" command: | - nix-instantiate -A ci.gcroot --add-root /nix/var/nix/gcroots/depot/canon + nix-build -A ci.gcroot --out-link /nix/var/nix/gcroots/depot/canon depends_on: - step: ":duck:" allow_failure: false |