diff --git a/.github/workflows/flake-update.yml b/.github/workflows/flake-update.yml index 01525d47..f6a78363 100644 --- a/.github/workflows/flake-update.yml +++ b/.github/workflows/flake-update.yml @@ -144,6 +144,7 @@ jobs: stdin: ${{ runner.temp }}/ci.build.cache - env: NF_CONFIG_ROOT: ${{ github.workspace }} + NF_UPDATE_CACHIX_PUSH: '' NF_UPDATE_GIT_COMMIT: '1' NF_UPDATE_SKIP: '1' id: flake-commit diff --git a/ci/flake-cron.nix b/ci/flake-cron.nix index 5d092387..a42e874e 100644 --- a/ci/flake-cron.nix +++ b/ci/flake-cron.nix @@ -53,6 +53,7 @@ in { env = { NF_UPDATE_SKIP = "1"; NF_UPDATE_GIT_COMMIT = "1"; + NF_UPDATE_CACHIX_PUSH = ""; NF_CONFIG_ROOT = "\${{ github.workspace }}"; }; }; diff --git a/ci/update.sh b/ci/update.sh index f3daeebd..70de8a8c 100644 --- a/ci/update.sh +++ b/ci/update.sh @@ -28,12 +28,13 @@ if [[ -z ${NF_UPDATE_SKIP-} ]]; then nf-actions-test -L fi -if [[ -n ${NF_UPDATE_CACHIX_PUSH-} ]]; then +if [[ -n ${NF_UPDATE_CACHIX_PUSH-} && -v NF_ACTIONS_TEST_OUTLINK ]]; then cachix push gensokyo-infrastructure "./${NF_ACTIONS_TEST_OUTLINK}"*/ & CACHIX_PUSH=$! fi if [[ -z ${NF_UPDATE_GIT_COMMIT-} ]]; then + wait ${CACHIX_PUSH-} exit fi