From 4c86caefc587fafd7050b1407be7508a01622b6d Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 29 Dec 2023 00:51:14 -0500
Subject: ci: cleanup eval-flake.sh

---
 .github/workflows/ci.yaml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to '.github/workflows/ci.yaml')

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 4c03f04..c852112 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -31,9 +31,13 @@ jobs:
       - name: Evaluate jobs
         id: eval
         run: |
-          nix shell --inputs-from . \
+          set -euo pipefail
+
+          matrix=$(nix shell --inputs-from . \
             nixpkgs#{bash,coreutils,jq,nix-eval-jobs} \
-            --command bash ./.github/eval-flake.sh
+            --command ./.github/eval-flake.sh)
+
+          echo "matrix=$matrix" >> "$GITHUB_OUTPUT"
 
   build:
     needs: eval
@@ -47,6 +51,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+        if: ${{ !matrix.isCached }}
 
       - name: Install Nix
         if: ${{ !matrix.isCached }}
@@ -91,10 +96,11 @@ jobs:
       - name: Run check
         run: |
           nix flake check \
+            --accept-flake-config \
             --print-build-logs \
             --fallback \
             --show-trace \
-            --option allow-import-from-derivation true
+            --allow-import-from-derivation
 
   gate:
     needs: [build, check]
-- 
cgit v1.2.3