fix: nix ci

PagoPlus · Jan 24, 2025 · c4f021b · c4f021b
1 parent 590346c
commit c4f021b
Showing 1 changed file with 25 additions and 11 deletions.
diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
@@ -1,29 +1,43 @@
 name: Nix CI
-
 on:
   push:
     branches: [ main ]
   pull_request:
     branches: [ main ]
 
 jobs:
-  tests:
-    runs-on: ${{ matrix.os }}
+  configure:
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.set-matrix.outputs.matrix }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: cachix/install-nix-action@v25
+      - id: set-matrix
+        # Set a default matrix in case ci fails
+        run: |
+          echo "matrix={\"include\":[{\"system\":\"x86_64-linux\",\"subflake\":\"default\"},{\"system\":\"aarch64-darwin\",\"subflake\":\"default\"}]}" >> $GITHUB_OUTPUT
+          nix run .#nixci -- gh-matrix --systems=x86_64-linux,aarch64-darwin | jq -c . >> $GITHUB_OUTPUT
+
+  nix:
+    runs-on: ${{ matrix.system }}
+    permissions:
+      contents: read
+    needs: configure
     strategy:
-      matrix:
-        os: [ubuntu-latest]
-        system: [x86_64-linux, aarch64-darwin]
+      matrix: ${{ fromJson(needs.configure.outputs.matrix) }}
+      fail-fast: false
     steps:
       - uses: actions/checkout@v4
       - uses: cachix/install-nix-action@v25
-        with:
-          nix_path: nixpkgs=channel:nixos-unstable
       - uses: DeterminateSystems/magic-nix-cache-action@v2
       - run: |
-          nix build \
+          nix run .#nixci -- \
             --extra-access-tokens "github.com=${{ secrets.GITHUB_TOKEN }}" \
-            .#default.${{ matrix.system }}
-      
+            build \
+            --systems "${{ matrix.system }}" \
+            .#default.${{ matrix.subflake}}
+
       - name: Upload artifact
         uses: actions/upload-artifact@v3
         with: