diff --git a/.github/actions/mac-nix-setup/action.yml b/.github/actions/mac-nix-setup/action.yml index 65dae39..8067194 100644 --- a/.github/actions/mac-nix-setup/action.yml +++ b/.github/actions/mac-nix-setup/action.yml @@ -29,3 +29,5 @@ runs: for f in /etc/bashrc /etc/zshrc; do test -e "$f" && sudo mv "$f" "$f.before-nix-darwin" done + echo "/nix/var/nix/profiles/default/bin" >> "$GITHUB_PATH" + echo "$HOME/.nix-profile/bin" >> "$GITHUB_PATH" diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml index 37b3d69..442ea57 100644 --- a/.github/workflows/bootstrap.yml +++ b/.github/workflows/bootstrap.yml @@ -57,13 +57,12 @@ jobs: - uses: ./.github/actions/mac-nix-setup with: github-token: ${{ secrets.GITHUB_TOKEN }} - - uses: nix-community/cache-nix-action@v6 + - uses: nix-community/cache-nix-action@v7 with: - primary-key: nix-${{ runner.os }}-${{ hashFiles('init.sh') }} + primary-key: nix-${{ runner.os }}-${{ hashFiles('flake.lock', 'init.sh') }} restore-prefixes-first-match: nix-${{ runner.os }}- - gc-max-store-size-macos: 1073741824 + paths-macos: | + ~/.cache/nix + gc-max-store-size-macos: 5368709120 - name: bash init.sh - run: | - # shellcheck disable=SC1091 - . /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh - bash init.sh + run: bash init.sh