about summary refs log tree commit diff
path: root/ops/pipelines
diff options
context:
space:
mode:
Diffstat (limited to 'ops/pipelines')
-rw-r--r--ops/pipelines/depot.nix18
-rw-r--r--ops/pipelines/static-pipeline.yaml18
2 files changed, 18 insertions, 18 deletions
diff --git a/ops/pipelines/depot.nix b/ops/pipelines/depot.nix
index 036ddada0ed7..b6941ba38aa7 100644
--- a/ops/pipelines/depot.nix
+++ b/ops/pipelines/depot.nix
@@ -19,6 +19,24 @@ let
     parentTargetMap = if (externalArgs ? parentTargetMap)
       then builtins.fromJSON (builtins.readFile externalArgs.parentTargetMap)
       else {};
+
+    postBuildSteps = [
+      # After successful builds, create a gcroot for builds on canon.
+      #
+      # This anchors *most* of the depot, in practice it's unimportant
+      # if there is a build race and we get +-1 of the targets.
+      #
+      # Unfortunately this requires a third evaluation of the graph, but
+      # since it happens after :duck: it should not affect the timing of
+      # status reporting back to Gerrit.
+      {
+        label = ":anchor:";
+        branches = "refs/heads/canon";
+        command = ''
+          nix-build -A ci.gcroot --out-link /nix/var/nix/gcroots/depot/canon
+        '';
+      }
+    ];
   };
 
   drvmap = depot.nix.buildkite.mkDrvmap depot.ci.targets;
diff --git a/ops/pipelines/static-pipeline.yaml b/ops/pipelines/static-pipeline.yaml
index ad887d0ff610..23a1fba4f21a 100644
--- a/ops/pipelines/static-pipeline.yaml
+++ b/ops/pipelines/static-pipeline.yaml
@@ -109,21 +109,3 @@ steps:
       find ./pipeline -name 'post-chunk-*.json' | tac | while read chunk; do
         buildkite-agent pipeline upload $$chunk
       done
-
-  # After duck, on success, create a gcroot if the build branch is
-  # canon.
-  #
-  # We care that this anchors *most* of the depot, in practice it's
-  # unimportant if there is a build race and we get +-1 of the
-  # targets.
-  #
-  # Unfortunately this requires a third evaluation of the graph, but
-  # since it happens after :duck: it should not affect the timing of
-  # status reporting back to Gerrit.
-  - label: ":anchor:"
-    branches: "refs/heads/canon"
-    command: |
-      nix-build -A ci.gcroot --out-link /nix/var/nix/gcroots/depot/canon
-    depends_on:
-      - step: ":duck:"
-        allow_failure: false