lukegb/depot
1
0
Fork 0
Code Issues 1 Pull requests Projects Packages Activity Actions

nix/gitlab-ci: set --system as well, just in case

Browse source
This commit is contained in:
Luke Granger-Brown 2023-01-18 00:20:27 +00:00
parent 44e44b0442
commit 30ce5c174b
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nix/gitlab-ci/default.nix
View file

@ -10,7 +10,7 @@ let
image = "nixos/nix:latest"; image = "nixos/nix:latest";
script = [ script = [
"nix run -f ./ third_party.nixpkgs.bash -c ./hack/populate_secrets.sh" "nix run -f ./ third_party.nixpkgs.bash -c ./hack/populate_secrets.sh"
"nix build -v -f ./ci-root.nix --argstr system ${system} --substituters \"https://cache.nixos.org/ s3://lukegb-nix-cache?endpoint=storage.googleapis.com&trusted=1\"" "nix build -v -f ./ci-root.nix --system ${system} --argstr system ${system} --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 copy -v --to 's3://lukegb-nix-cache?endpoint=storage.googleapis.com' ./result"
]; ];
allow_failure = true; allow_failure = true;
@ -21,7 +21,7 @@ let
image = "nixos/nix:latest"; image = "nixos/nix:latest";
script = [ script = [
"nix run -f ./ third_party.nixpkgs.bash -c ./hack/populate_secrets.sh" "nix run -f ./ third_party.nixpkgs.bash -c ./hack/populate_secrets.sh"
"nix build -v -f ./ci-root.nix --argstr system ${system} --substituters \"https://cache.nixos.org/ s3://lukegb-nix-cache?endpoint=storage.googleapis.com&trusted=1\"" "nix build -v -f ./ci-root.nix --system ${system} --argstr system ${system} --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" "GOOGLE_APPLICATION_CREDENTIALS=$HOME/sa.json nix run -f ./ go.nix.bcacheup -c bcacheup --cache_url gs://lukegb-nix-cache ./result"
"cat ./result/other-systemPathJSON > systems.json" "cat ./result/other-systemPathJSON > systems.json"
]; ];