From 42da93f99aa1904f515e9ba6decbfcfd88318900 Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <hg@lukegb.com>
Date: Sun, 9 Oct 2022 16:57:21 +0100
Subject: [PATCH] gitlab-ci: use bcacheup to upload things to the nix cache

---
 ci-root.nix               | 1 +
 nix/gitlab-ci/default.nix | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ci-root.nix b/ci-root.nix
index 621108ac80..44ba690553 100644
--- a/ci-root.nix
+++ b/ci-root.nix
@@ -30,6 +30,7 @@ let
         twitterchiver-archiver-docker = depot.go.twitterchiver.archiver.dockerImage;
         twitternuke = depot.go.twitternuke;
         systemPathJSON = depot.ops.nixos.systemPathJSON;
+        inherit (depot.go.nix) bcachegc bcacheup;
       };
       factorio = depot.ops.factorio;
       home-manager = depot.ops.home-manager-ext.built;
diff --git a/nix/gitlab-ci/default.nix b/nix/gitlab-ci/default.nix
index 328c66982a..52f15fceab 100644
--- a/nix/gitlab-ci/default.nix
+++ b/nix/gitlab-ci/default.nix
@@ -25,7 +25,7 @@ let
       script = [
         "nix run -f ./ third_party.nixpkgs.bash -c ./hack/populate_secrets.sh"
         "nix build -v -f ./ci-root.nix --substituters \"https://cache.nixos.org/ s3://lukegb-nix-cache?endpoint=storage.googleapis.com&trusted=1\""
-        "nix copy -v --to 's3://lukegb-nix-cache?endpoint=storage.googleapis.com' ./result"
+        "nix run -f ./ go.nix.bcacheup -c bcacheup --cache_url gs://lukegb-nix-cache ./result"
         "cat ./result/other-systemPathJSON > systems.json"
       ];
       artifacts = {