diff --git a/.github/workflows/autofix.yml b/.github/workflows/autofix.yml index 7c0b3db..d4ce257 100644 --- a/.github/workflows/autofix.yml +++ b/.github/workflows/autofix.yml @@ -12,7 +12,14 @@ jobs: steps: - uses: actions/checkout@v4 - uses: DeterminateSystems/nix-installer-action@v16 - - uses: DeterminateSystems/magic-nix-cache-action@v9 + with: + extra-conf: | + accept-flake-config = true + log-lines = 1000 + - uses: cachix/cachix-action@v15 + with: + name: recap + authToken: ${{ secrets.CACHIX_TOKEN }} - run: nix fmt - uses: autofix-ci/action@v1.3.1 with: diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index fd6c8ee..33ff474 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -10,5 +10,12 @@ jobs: steps: - uses: actions/checkout@v4 - uses: DeterminateSystems/nix-installer-action@v16 - - uses: DeterminateSystems/magic-nix-cache-action@v9 + with: + extra-conf: | + accept-flake-config = true + log-lines = 1000 + - uses: cachix/cachix-action@v15 + with: + name: recap + authToken: ${{ secrets.CACHIX_TOKEN }} - run: nix flake check --show-trace diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d8d83e3..1fdc450 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,8 +20,6 @@ jobs: url: https://github.com/wi2trier/cbrkit/releases/tag/${{ steps.semanticrelease.outputs.git-tag }} steps: - uses: actions/checkout@v4 - - uses: DeterminateSystems/nix-installer-action@v16 - - uses: DeterminateSystems/magic-nix-cache-action@v9 - uses: cihelper/action-semanticrelease-npm@v1 id: semanticrelease deploy-docker: @@ -39,7 +37,14 @@ jobs: with: ref: ${{ needs.release.outputs.git-head }} - uses: DeterminateSystems/nix-installer-action@v16 - - uses: DeterminateSystems/magic-nix-cache-action@v9 + with: + extra-conf: | + accept-flake-config = true + log-lines = 1000 + - uses: cachix/cachix-action@v15 + with: + name: recap + authToken: ${{ secrets.CACHIX_TOKEN }} - run: nix run .#docker-manifest --impure env: VERSION: ${{ needs.release.outputs.version }} diff --git a/flake.nix b/flake.nix index 4cfa8b5..467ce78 100644 --- a/flake.nix +++ b/flake.nix @@ -12,6 +12,16 @@ inputs.nixpkgs.follows = "nixpkgs"; }; }; + nixConfig = { + extra-substituters = [ + "https://nix-community.cachix.org" + "https://recap.cachix.org" + ]; + extra-trusted-public-keys = [ + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + "recap.cachix.org-1:KElwRDtaJbbQxmmS2SyxWHqs9bdJbaZHzb2iINTfQws=" + ]; + }; outputs = inputs@{ flake-parts,