From f994f155cd5bcb913719ab82835d603edd6ac9c7 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 10 May 2020 02:32:05 +0100 Subject: [PATCH] gitlab-ci: RAAAARGH --- .gitlab-ci.yml | 2 +- hack/populate_secrets.sh | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 107e93a72c..a87752abd3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,7 +6,7 @@ nixCache: stage: build image: "nixos/nix:latest" script: - - "./hack/populate_secrets.sh" + - "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" diff --git a/hack/populate_secrets.sh b/hack/populate_secrets.sh index 1a2cd74a4e..30b20c40e5 100755 --- a/hack/populate_secrets.sh +++ b/hack/populate_secrets.sh @@ -1,5 +1,4 @@ -#!/usr/bin/env nix-shell -#!nix-shell -p bash -i bash +#!/usr/bin/env bash set -eu