From b8044c29ddc59d9c6346337d589b73a7e5b0511e Mon Sep 17 00:00:00 2001 From: Hannes Date: Tue, 27 May 2025 05:05:08 +0800 Subject: [PATCH] Replace magic-nix-cache-action (#2575) --- .github/workflows/build.yml | 14 ++++++++++---- .github/workflows/check-tests.yaml | 7 +++++-- .github/workflows/lint.yml | 21 +++++++++++++++------ .github/workflows/release.yml | 7 +++++-- .github/workflows/test-integration.yaml | 7 +++++-- .github/workflows/test.yml | 7 +++++-- 6 files changed, 45 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 53ddc5a7..4ec0b652 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,10 +31,13 @@ jobs: - '**/*.go' - 'integration_test/' - 'config-example.yaml' - - uses: DeterminateSystems/nix-installer-action@main + - uses: nixbuild/nix-quick-install-action@master if: steps.changed-files.outputs.files == 'true' - - uses: DeterminateSystems/magic-nix-cache-action@main + - uses: nix-community/cache-nix-action@main if: steps.changed-files.outputs.files == 'true' + with: + primary-key: nix-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('**/*.nix', '**/flake.lock') }} + restore-prefixes-first-match: nix-${{ runner.os }}-${{ runner.arch }} - name: Run nix build id: build @@ -84,8 +87,11 @@ jobs: - "GOARCH=amd64 GOOS=darwin" steps: - uses: actions/checkout@v4 - - uses: DeterminateSystems/nix-installer-action@main - - uses: DeterminateSystems/magic-nix-cache-action@main + - uses: nixbuild/nix-quick-install-action@master + - uses: nix-community/cache-nix-action@main + with: + primary-key: nix-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('**/*.nix', '**/flake.lock') }} + restore-prefixes-first-match: nix-${{ runner.os }}-${{ runner.arch }} - name: Run go cross compile run: env ${{ matrix.env }} nix develop --command -- go build -o "headscale" ./cmd/headscale diff --git a/.github/workflows/check-tests.yaml b/.github/workflows/check-tests.yaml index 486bed0b..84149088 100644 --- a/.github/workflows/check-tests.yaml +++ b/.github/workflows/check-tests.yaml @@ -24,10 +24,13 @@ jobs: - '**/*.go' - 'integration_test/' - 'config-example.yaml' - - uses: DeterminateSystems/nix-installer-action@main + - uses: nixbuild/nix-quick-install-action@master if: steps.changed-files.outputs.files == 'true' - - uses: DeterminateSystems/magic-nix-cache-action@main + - uses: nix-community/cache-nix-action@main if: steps.changed-files.outputs.files == 'true' + with: + primary-key: nix-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('**/*.nix', '**/flake.lock') }} + restore-prefixes-first-match: nix-${{ runner.os }}-${{ runner.arch }} - name: Generate and check integration tests if: steps.changed-files.outputs.files == 'true' diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 94953fbc..934876b1 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -24,10 +24,13 @@ jobs: - '**/*.go' - 'integration_test/' - 'config-example.yaml' - - uses: DeterminateSystems/nix-installer-action@main + - uses: nixbuild/nix-quick-install-action@master if: steps.changed-files.outputs.files == 'true' - - uses: DeterminateSystems/magic-nix-cache-action@main + - uses: nix-community/cache-nix-action@main if: steps.changed-files.outputs.files == 'true' + with: + primary-key: nix-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('**/*.nix', '**/flake.lock') }} + restore-prefixes-first-match: nix-${{ runner.os }}-${{ runner.arch }} - name: golangci-lint if: steps.changed-files.outputs.files == 'true' @@ -55,10 +58,13 @@ jobs: - '**/*.css' - '**/*.scss' - '**/*.html' - - uses: DeterminateSystems/nix-installer-action@main + - uses: nixbuild/nix-quick-install-action@master if: steps.changed-files.outputs.files == 'true' - - uses: DeterminateSystems/magic-nix-cache-action@main + - uses: nix-community/cache-nix-action@main if: steps.changed-files.outputs.files == 'true' + with: + primary-key: nix-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('**/*.nix', '**/flake.lock') }} + restore-prefixes-first-match: nix-${{ runner.os }}-${{ runner.arch }} - name: Prettify code if: steps.changed-files.outputs.files == 'true' @@ -68,8 +74,11 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: DeterminateSystems/nix-installer-action@main - - uses: DeterminateSystems/magic-nix-cache-action@main + - uses: nixbuild/nix-quick-install-action@master + - uses: nix-community/cache-nix-action@main + with: + primary-key: nix-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('**/*.nix', '**/flake.lock') }} + restore-prefixes-first-match: nix-${{ runner.os }}-${{ runner.arch }} - name: Buf lint run: nix develop --command -- buf lint proto diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d2488ff7..e43012bf 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -30,8 +30,11 @@ jobs: username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - - uses: DeterminateSystems/nix-installer-action@main - - uses: DeterminateSystems/magic-nix-cache-action@main + - uses: nixbuild/nix-quick-install-action@master + - uses: nix-community/cache-nix-action@main + with: + primary-key: nix-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('**/*.nix', '**/flake.lock') }} + restore-prefixes-first-match: nix-${{ runner.os }}-${{ runner.arch }} - name: Run goreleaser run: nix develop --command -- goreleaser release --clean diff --git a/.github/workflows/test-integration.yaml b/.github/workflows/test-integration.yaml index 61213ea6..b0e2daea 100644 --- a/.github/workflows/test-integration.yaml +++ b/.github/workflows/test-integration.yaml @@ -116,10 +116,13 @@ jobs: - name: Setup SSH server for Actor if: ${{ env.HAS_TAILSCALE_SECRET }} uses: alexellis/setup-sshd-actor@master - - uses: DeterminateSystems/nix-installer-action@main + - uses: nixbuild/nix-quick-install-action@master if: steps.changed-files.outputs.files == 'true' - - uses: DeterminateSystems/magic-nix-cache-action@main + - uses: nix-community/cache-nix-action@main if: steps.changed-files.outputs.files == 'true' + with: + primary-key: nix-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('**/*.nix', '**/flake.lock') }} + restore-prefixes-first-match: nix-${{ runner.os }}-${{ runner.arch }} - uses: satackey/action-docker-layer-caching@main if: steps.changed-files.outputs.files == 'true' continue-on-error: true diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 610c60f6..0384b6ec 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -27,10 +27,13 @@ jobs: - 'integration_test/' - 'config-example.yaml' - - uses: DeterminateSystems/nix-installer-action@main + - uses: nixbuild/nix-quick-install-action@master if: steps.changed-files.outputs.files == 'true' - - uses: DeterminateSystems/magic-nix-cache-action@main + - uses: nix-community/cache-nix-action@main if: steps.changed-files.outputs.files == 'true' + with: + primary-key: nix-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('**/*.nix', '**/flake.lock') }} + restore-prefixes-first-match: nix-${{ runner.os }}-${{ runner.arch }} - name: Run tests if: steps.changed-files.outputs.files == 'true'