flake reorg

.github/workflows/nix.yaml

@@ -1,63 +1,28 @@
-name: "Build"
-on:
-  pull_request:
-  push:
+on: [push, pull_request]
+
+name: CI
 
 jobs:
-  check:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v26
-      - uses: icewind1991/attic-action@v1
-        with:
-          name: ci
-          instance: https://cache.icewind.me
-          authToken: '${{ secrets.ATTIC_TOKEN }}'
-      - run: nix build .#check
-
-  clippy:
-    runs-on: ubuntu-latest
-    needs: check
-    steps:
-      - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v26
-      - uses: icewind1991/attic-action@v1
-        with:
-          name: ci
-          instance: https://cache.icewind.me
-          authToken: '${{ secrets.ATTIC_TOKEN }}'
-      - run: nix build .#clippy
-
-  msrv:
-    runs-on: ubuntu-latest
-    needs: check
-    steps:
-      - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v26
-      - uses: icewind1991/attic-action@v1
-        with:
-          name: ci
-          instance: https://cache.icewind.me
-          authToken: '${{ secrets.ATTIC_TOKEN }}'
-      - run: nix build .#msrv
-
   matrix:
     runs-on: ubuntu-latest
     outputs:
-      matrix: ${{ steps.set-matrix.outputs.matrix }}
+      check-matrix: ${{ steps.set-matrix.outputs.check-matrix }}
+      cross-matrix: ${{ steps.set-matrix.outputs.cross-matrix }}
     steps:
       - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v26
+      - uses: cachix/install-nix-action@v27
       - id: set-matrix
-        run: echo "matrix={\"target\":$(nix eval --json ".#targets.x86_64-linux")}" | tee $GITHUB_OUTPUT
+        run: |
+          echo "check-matrix={\"check\":$(nix eval --json '.#checks.x86_64-linux' --apply 'builtins.attrNames')}" | tee -a $GITHUB_OUTPUT
+          echo "cross-matrix={\"include\":$(nix eval --json '.#lib.crossMatrix')}" | tee -a $GITHUB_OUTPUT
 
-  build:
+  checks:
     runs-on: ubuntu-latest
-    needs: [check, matrix]
+    needs: [matrix]
     strategy:
       fail-fast: false
-      matrix: ${{fromJson(needs.matrix.outputs.matrix)}}
+      matrix: ${{fromJson(needs.matrix.outputs.check-matrix)}}
+    name: ${{ matrix.check }}
     steps:
       - uses: actions/checkout@v4
       - uses: cachix/install-nix-action@v26
@@ -65,9 +30,25 @@ jobs:
         with:
           name: ci
           instance: https://cache.icewind.me
-          authToken: '${{ secrets.ATTIC_TOKEN }}'
+          authToken: "${{ secrets.ATTIC_TOKEN }}"
+      - run: nix build .#checks.x86_64-linux.${{ matrix.check }}
+
+  build:
+    runs-on: ubuntu-latest
+    needs: [matrix, checks]
+    strategy:
+      fail-fast: false
+      matrix: ${{fromJson(needs.matrix.outputs.cross-matrix)}}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: cachix/install-nix-action@v27
+      - uses: icewind1991/attic-action@v1
+        with:
+          name: ci
+          instance: https://cache.icewind.me
+          authToken: "${{ secrets.ATTIC_TOKEN }}"
       - run: nix build .#${{ matrix.target }}
       - uses: actions/upload-artifact@v4
         with:
           name: palantir-${{ matrix.target }}
-          path: result/bin/*
+          path: result/bin/palantir${{ matrix.binary-suffix }}

.github/workflows/release.yml

@@ -4,36 +4,40 @@ on:
   release:
     types: [created]
 
+permissions:
+  contents: write
 
 jobs:
   matrix:
     runs-on: ubuntu-latest
     outputs:
-      matrix: ${{ steps.set-matrix.outputs.matrix }}
+      cross-matrix: ${{ steps.set-matrix.outputs.cross-matrix }}
     steps:
       - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v26
+      - uses: cachix/install-nix-action@v27
       - id: set-matrix
-        run: echo "matrix=$(nix eval --json ".#releaseMatrix.x86_64-linux")" | tee $GITHUB_OUTPUT
+        run: |
+          echo "cross-matrix={\"include\":$(nix eval --json '.#lib.crossMatrix')}" | tee -a $GITHUB_OUTPUT
 
   build:
     runs-on: ubuntu-latest
-    needs: matrix
+    needs: [matrix]
     strategy:
-      matrix: ${{fromJson(needs.matrix.outputs.matrix)}}
+      fail-fast: false
+      matrix: ${{fromJson(needs.matrix.outputs.cross-matrix)}}
     steps:
       - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v26
+      - uses: cachix/install-nix-action@v27
       - uses: icewind1991/attic-action@v1
         with:
           name: ci
           instance: https://cache.icewind.me
-          authToken: '${{ secrets.ATTIC_TOKEN }}'
+          authToken: "${{ secrets.ATTIC_TOKEN }}"
       - run: nix build .#${{ matrix.target }}
       - name: Upload binary to release
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: result/bin/${{ matrix.artifact_name }}
-          asset_name: ${{ matrix.asset_name }}
+          file: result/bin/palantir${{ matrix.binary-suffix }}
+          asset_name: palantir-${{ matrix.target }}${{ matrix.binary-suffix }}
           tag: ${{ github.ref }}