From 664ce62be8d976ba8e67958b0b3ced527ef20f4f Mon Sep 17 00:00:00 2001 From: arcnmx Date: Wed, 19 May 2021 15:35:51 -0700 Subject: [PATCH 1/2] ci: fix niv update cachix push --- ci/niv-cron.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/niv-cron.nix b/ci/niv-cron.nix index cad058ac..d7a262c8 100644 --- a/ci/niv-cron.nix +++ b/ci/niv-cron.nix @@ -73,9 +73,9 @@ with lib; { if nix build -Lf . hosts.{athame,yule,samhain}.config.system.build.toplevel; then if [[ -n $CACHIX_SIGNING_KEY ]]; then nix build --no-link -Lf . sourceCache.all - cachix push kittywitch $(nix eval -f . sourceCache.allStr) + cachix push kittywitch $(nix eval --raw -f . sourceCache.allStr) - cachix push kittywitch $(readlink result*/) & + cachix push kittywitch result*/ & CACHIX_PUSH=$! fi if [[ -n $OPENSSH_PRIVATE_KEY ]]; then From 5b87b8dede315a3a9de294cc10331688dc3ea337 Mon Sep 17 00:00:00 2001 From: arcnmx Date: Wed, 19 May 2021 15:49:51 -0700 Subject: [PATCH 2/2] ci: fix branch detection --- ci/niv-cron.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/niv-cron.nix b/ci/niv-cron.nix index d7a262c8..6a19438c 100644 --- a/ci/niv-cron.nix +++ b/ci/niv-cron.nix @@ -41,7 +41,7 @@ with lib; { ci.command { name = "niv-update-build"; displayName = "niv update build"; - environment = [ "OPENSSH_PRIVATE_KEY" "CACHIX_SIGNING_KEY" ]; + environment = [ "OPENSSH_PRIVATE_KEY" "CACHIX_SIGNING_KEY" "GITHUB_REF" ]; command = '' if [[ -n $OPENSSH_PRIVATE_KEY ]]; then mkdir ~/.ssh