From 18d186642e14b65da3f5c9eef61c9c2e7ea7e00c Mon Sep 17 00:00:00 2001 From: Kat Inskip Date: Fri, 25 Oct 2024 16:23:12 -0400 Subject: [PATCH] feat: move to auth token for cachix? --- ci/flake-cron.nix | 4 ++-- ci/nodes.nix | 6 +++--- packages/nf-build-system/build-system.sh | 2 +- packages/nf-update/update.sh | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ci/flake-cron.nix b/ci/flake-cron.nix index ae322a87..a9ce858f 100644 --- a/ci/flake-cron.nix +++ b/ci/flake-cron.nix @@ -14,7 +14,7 @@ in { gh-actions = { env = { - CACHIX_SIGNING_KEY = "\${{ secrets.CACHIX_SIGNING_KEY }}"; + CACHIX_AUTH_TOKEN = "\${{ secrets.CACHIX_AUTH_TOKEN }}"; DISCORD_WEBHOOK_LINK = "\${{ secrets.DISCORD_WEBHOOK_LINK }}"; }; on = let @@ -43,7 +43,7 @@ in { order = 500; run = "nix run .#nf-update"; env = { - CACHIX_SIGNING_KEY = "\${{ secrets.CACHIX_SIGNING_KEY }}"; + CACHIX_AUTH_TOKEN = "\${{ secrets.CACHIX_AUTH_TOKEN }}"; DISCORD_WEBHOOK_LINK = "\${{ secrets.DISCORD_WEBHOOK_LINK }}"; NF_UPDATE_GIT_COMMIT = "1"; NF_UPDATE_CACHIX_PUSH = "1"; diff --git a/ci/nodes.nix b/ci/nodes.nix index c941a591..bbfab030 100644 --- a/ci/nodes.nix +++ b/ci/nodes.nix @@ -14,7 +14,7 @@ in { gh-actions = { env = { - CACHIX_SIGNING_KEY = "\${{ secrets.CACHIX_SIGNING_KEY }}"; + CACHIX_AUTH_TOKEN = "\${{ secrets.CACHIX_AUTH_TOKEN }}"; DISCORD_WEBHOOK_LINK = "\${{ secrets.DISCORD_WEBHOOK_LINK }}"; }; on = let @@ -40,7 +40,7 @@ in { order = 500; run = "nix run .#nf-build-system -- nixosConfigurations.${name}.config.system.build.toplevel ${name} NixOS"; env = { - CACHIX_SIGNING_KEY = "\${{ secrets.CACHIX_SIGNING_KEY }}"; + CACHIX_AUTH_TOKEN = "\${{ secrets.CACHIX_AUTH_TOKEN }}"; DISCORD_WEBHOOK_LINK = "\${{ secrets.DISCORD_WEBHOOK_LINK }}"; NF_UPDATE_CACHIX_PUSH = "1"; NF_CONFIG_ROOT = "\${{ github.workspace }}"; @@ -54,7 +54,7 @@ in { order = 500; run = "nix run .#nf-build-system -- homeConfigurations.${name}.activationPackage ${name} Home"; env = { - CACHIX_SIGNING_KEY = "\${{ secrets.CACHIX_SIGNING_KEY }}"; + CACHIX_AUTH_TOKEN = "\${{ secrets.CACHIX_AUTH_TOKEN }}"; DISCORD_WEBHOOK_LINK = "\${{ secrets.DISCORD_WEBHOOK_LINK }}"; NF_UPDATE_CACHIX_PUSH = "1"; NF_CONFIG_ROOT = "\${{ github.workspace }}"; diff --git a/packages/nf-build-system/build-system.sh b/packages/nf-build-system/build-system.sh index 1c2e68a4..28315050 100644 --- a/packages/nf-build-system/build-system.sh +++ b/packages/nf-build-system/build-system.sh @@ -58,7 +58,7 @@ fi send_discord_message "Starting ${SYSTEM_TYPE} system build for ${ALIAS}" -if [[ -n ${CACHIX_SIGNING_KEY-} ]]; then +if [[ -n ${CACHIX_AUTH_TOKEN-} ]]; then export NF_UPDATE_CACHIX_PUSH=1 fi diff --git a/packages/nf-update/update.sh b/packages/nf-update/update.sh index a23dbd33..f75329f7 100644 --- a/packages/nf-update/update.sh +++ b/packages/nf-update/update.sh @@ -11,7 +11,7 @@ send_discord_message() { -X POST --data "{\"content\": $escaped_message}" "$DISCORD_WEBHOOK_LINK" } -if [[ -n ${CACHIX_SIGNING_KEY-} ]]; then +if [[ -n ${CACHIX_AUTH_TOKEN-} ]]; then export NF_UPDATE_CACHIX_PUSH=1 fi