diff --git a/.github/actions/setup-nix/action.yml b/.github/actions/setup-nix/action.yml index 4f8efa2..7474d53 100644 --- a/.github/actions/setup-nix/action.yml +++ b/.github/actions/setup-nix/action.yml @@ -4,9 +4,6 @@ description: | Sets up the Nix environment for wire, removing unnecessary bloat and installing Nix along with proper substituters being set inputs: - cachixToken: - description: Cachix token - required: true withQEMU: description: Enable QEMU default: false @@ -28,6 +25,9 @@ runs: echo "extra-platforms = aarch64-linux i686-linux" fi + echo "substituters = https://cache.nixos.org?priority=1 https://cache.althaea.zone?priority=2 https://cache.garnix.io?priority=3" + echo "trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g= cache.althaea.zone:BelRpa863X9q3Y+AOnl5SM7QFzre3qb+5I7g2s/mqHI=" + echo EOF } >> "$GITHUB_OUTPUT" - uses: cachix/install-nix-action@v31 @@ -48,7 +48,3 @@ runs: shell: bash run: | cat /proc/sys/fs/binfmt_misc/qemu-aarch64 - - uses: cachix/cachix-action@v16 - with: - name: wires - authToken: "${{ inputs.cachixToken }}" diff --git a/.github/workflows/autofix.yml b/.github/workflows/autofix.yml index ded002d..95407f6 100644 --- a/.github/workflows/autofix.yml +++ b/.github/workflows/autofix.yml @@ -27,8 +27,6 @@ jobs: steps: - uses: actions/checkout@v6 - uses: ./.github/actions/setup-nix - with: - cachixToken: ${{ secrets.CACHIX_AUTH_TOKEN }} - name: Cache Cargo uses: actions/cache@v4 with: diff --git a/.github/workflows/follow-nixpkgs.yml b/.github/workflows/follow-nixpkgs.yml index 8f4b4f7..7835239 100644 --- a/.github/workflows/follow-nixpkgs.yml +++ b/.github/workflows/follow-nixpkgs.yml @@ -27,8 +27,6 @@ jobs: ssh-key: ${{ secrets.FOLLOW_NIXPKGS_PRIVATE_KEY }} ref: main - uses: ./.github/actions/setup-nix - with: - cachixToken: ${{ secrets.CACHIX_AUTH_TOKEN }} - run: | git config user.name 'github-actions[bot]' git config user.email 'github-actions[bot]@users.noreply.github.com' diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml index b9a0539..71c147f 100644 --- a/.github/workflows/pages.yml +++ b/.github/workflows/pages.yml @@ -24,8 +24,6 @@ jobs: steps: - uses: actions/checkout@v6 - uses: ./.github/actions/setup-nix - with: - cachixToken: ${{ secrets.CACHIX_AUTH_TOKEN }} - run: nix build .#docs if: github.ref == 'refs/heads/stable' - run: nix build .#docs-unstable diff --git a/.github/workflows/pr-preview.yml b/.github/workflows/pr-preview.yml index 5926ef3..79211ec 100644 --- a/.github/workflows/pr-preview.yml +++ b/.github/workflows/pr-preview.yml @@ -37,8 +37,6 @@ jobs: with: ref: ${{ needs.base-ref.outputs.base-ref }} - uses: ./.github/actions/setup-nix - with: - cachixToken: ${{ secrets.CACHIX_AUTH_TOKEN }} - id: drv run: echo "drv=$(nix eval .#docs --json)" >> "$GITHUB_OUTPUT" eval-head: @@ -50,8 +48,6 @@ jobs: steps: - uses: actions/checkout@v6 - uses: ./.github/actions/setup-nix - with: - cachixToken: ${{ secrets.CACHIX_AUTH_TOKEN }} - id: drv run: echo "drv=$(nix eval .#docs --json)" >> "$GITHUB_OUTPUT" deploy: @@ -68,8 +64,6 @@ jobs: steps: - uses: actions/checkout@v6 - uses: ./.github/actions/setup-nix - with: - cachixToken: ${{ secrets.CACHIX_AUTH_TOKEN }} - run: nix build .#docs - name: Deploy to Cloudflare Pages id: deployment diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d361916..dc63dcb 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -24,8 +24,6 @@ jobs: steps: - uses: actions/checkout@v6 - uses: ./.github/actions/setup-nix - with: - cachixToken: ${{ secrets.CACHIX_AUTH_TOKEN }} - name: Build Tests run: nix build .#cargo-tests -L -vv - name: Cargo Tests