From 9d16934db326a7fb1bcdba7a2d3351a8e32e19fe Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 9 Oct 2022 17:35:43 +0100 Subject: [PATCH] nix/gitlab-ci: attempt to hack around us wanting to read the nix store DB --- go/nix/bcacheup/bcacheup.go | 3 ++- nix/gitlab-ci/default.nix | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/go/nix/bcacheup/bcacheup.go b/go/nix/bcacheup/bcacheup.go index e975939dac..370a38b29a 100644 --- a/go/nix/bcacheup/bcacheup.go +++ b/go/nix/bcacheup/bcacheup.go @@ -31,6 +31,7 @@ import ( var ( blobURLFlag = flag.String("cache_url", "", "Cache URL") + storeDBFlag = flag.String("nix_store_db", nixstore.DefaultStoreDB, "Path to the nix store database") ) var ( @@ -419,7 +420,7 @@ func main() { } defer bucket.Close() - store, err := nixstore.Open(nixstore.DefaultStoreDB) + store, err := nixstore.Open(*storeDBFlag) if err != nil { log.Fatalf("opening Nix store: %v", err) } diff --git a/nix/gitlab-ci/default.nix b/nix/gitlab-ci/default.nix index fbc59b81a8..cb657d997d 100644 --- a/nix/gitlab-ci/default.nix +++ b/nix/gitlab-ci/default.nix @@ -25,7 +25,8 @@ 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\"" - "GOOGLE_APPLICATION_CREDENTIALS=$HOME/sa.json nix run -f ./ go.nix.bcacheup -c bcacheup --cache_url gs://lukegb-nix-cache ./result" + "cp /nix/var/nix/db/db.sqlite db.sqlite" + "GOOGLE_APPLICATION_CREDENTIALS=$HOME/sa.json nix run -f ./ go.nix.bcacheup -c bcacheup --cache_url gs://lukegb-nix-cache --nix_store_db ./db.sqlite ./result" "cat ./result/other-systemPathJSON > systems.json" ]; artifacts = {