From 46c7c9ecb17b00c50408e8a6523cdfe3013b2f7d Mon Sep 17 00:00:00 2001 From: teutat3s Date: Sun, 21 Apr 2024 19:58:58 +0200 Subject: [PATCH 1/2] ci: update nix-quick-install-action, cache-nix-action, cachix-action --- .forgejo/workflows/check.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/check.yml b/.forgejo/workflows/check.yml index f8f9f03..a44a341 100644 --- a/.forgejo/workflows/check.yml +++ b/.forgejo/workflows/check.yml @@ -10,7 +10,7 @@ jobs: - name: Check out repository code uses: https://code.forgejo.org/actions/checkout@v4 - - uses: https://github.com/nixbuild/nix-quick-install-action@v26 + - uses: https://github.com/nixbuild/nix-quick-install-action@v27 with: load_nixConfig: false nix_conf: | @@ -24,7 +24,7 @@ jobs: echo "hash=$(md5sum flake.lock | awk '{print $1}')" >> $GITHUB_OUTPUT - name: Restore and cache Nix store - uses: https://github.com/nix-community/cache-nix-action@v4 + uses: https://github.com/nix-community/cache-nix-action@v5 id: nix-store-cache with: key: cache-${{ runner.os }}-nix-store-${{ steps.flake-lock-hash.outputs.hash }} @@ -40,7 +40,7 @@ jobs: purge-created-max-age: 42 - name: Prepare cachix - uses: https://github.com/cachix/cachix-action@v12 + uses: https://github.com/cachix/cachix-action@v14 with: name: pub-solar authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' -- 2.44.2 From a0c6f0dc08d9de794cb22279da2e25b5950e61dd Mon Sep 17 00:00:00 2001 From: teutat3s Date: Sun, 21 Apr 2024 20:17:03 +0200 Subject: [PATCH 2/2] ci: fix cache-nix-action, use new config syntax --- .forgejo/workflows/check.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.forgejo/workflows/check.yml b/.forgejo/workflows/check.yml index a44a341..0034e9e 100644 --- a/.forgejo/workflows/check.yml +++ b/.forgejo/workflows/check.yml @@ -27,17 +27,16 @@ jobs: uses: https://github.com/nix-community/cache-nix-action@v5 id: nix-store-cache with: - key: cache-${{ runner.os }}-nix-store-${{ steps.flake-lock-hash.outputs.hash }} - restore-keys: | + primary-key: cache-${{ runner.os }}-nix-store-${{ steps.flake-lock-hash.outputs.hash }} + restore-prefixes-first-match: | cache-${{ runner.os }}-nix-store- gc-linux: true gc-max-store-size-linux: 10000000000 - purge-caches: true - purge-keys: cache-${{ runner.os }}-nix-store- - purge-created: true - purge-created-max-age: 42 + purge: true + purge-prefixes: cache-${{ runner.os }}-nix-store- + purge-created: 42 - name: Prepare cachix uses: https://github.com/cachix/cachix-action@v14 -- 2.44.2