diff options
| author | seth <[email protected]> | 2023-11-06 14:57:44 -0500 |
|---|---|---|
| committer | seth <[email protected]> | 2023-11-06 22:30:17 +0000 |
| commit | 130ba7fe473ba0ad8edc18d6004bff1b4f9d1bc0 (patch) | |
| tree | 485f5b2403471ee6dff2955e10ffe69abc01180e | |
| parent | ea6a9e2d5f3dd0d5ff12e80a4669efb21542c00c (diff) | |
ci: use nixbuild/nix-quick-install-action
| -rw-r--r-- | .github/workflows/ci.yaml | 24 | ||||
| -rw-r--r-- | .github/workflows/update-lock.yaml | 2 |
2 files changed, 12 insertions, 14 deletions
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6a30315..229d475 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -17,7 +17,7 @@ jobs: - uses: actions/checkout@v4 - name: install nix - uses: DeterminateSystems/nix-installer-action@v6 + uses: nixbuild/nix-quick-install-action@v26 - name: setup cachix uses: cachix/cachix-action@master @@ -54,13 +54,13 @@ jobs: - name: install nix if: matrix.arch != 'aarch64' - uses: DeterminateSystems/nix-installer-action@v6 + uses: nixbuild/nix-quick-install-action@v26 - name: install nix (with aarch64) if: matrix.arch == 'aarch64' - uses: DeterminateSystems/nix-installer-action@v6 + uses: nixbuild/nix-quick-install-action@v26 with: - extra-conf: "extra-platforms = aarch64-linux arm-linux" + nix_conf: "extra-platforms = aarch64-linux arm-linux" - name: setup cachix uses: cachix/cachix-action@master @@ -73,13 +73,18 @@ jobs: run: nix build -L --accept-flake-config --fallback .#${{ matrix.attr }} check: - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + os: [macos-latest, ubuntu-latest] + + runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 - name: install nix - uses: DeterminateSystems/nix-installer-action@v6 + uses: nixbuild/nix-quick-install-action@v26 - name: setup cachix uses: cachix/cachix-action@master @@ -88,13 +93,6 @@ jobs: authToken: ${{ secrets.CACHIX_AUTH_TOKEN }} skipAddingSubstituter: 'true' - - name: setup cachix - uses: cachix/cachix-action@v12 - with: - name: getchoo - authToken: ${{ secrets.CACHIX_AUTH_TOKEN }} - skipAddingSubstituter: 'true' - - name: run check run: nix flake check --accept-flake-config --show-trace diff --git a/.github/workflows/update-lock.yaml b/.github/workflows/update-lock.yaml index cb70c94..0813ea1 100644 --- a/.github/workflows/update-lock.yaml +++ b/.github/workflows/update-lock.yaml @@ -22,7 +22,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: DeterminateSystems/nix-installer-action@main + - uses: nixbuild/nix-quick-install-action@v26 - name: update lockfile uses: DeterminateSystems/update-flake-lock@v20 |