Try full matrix

codedownio · Jun 14, 2024 · aa71bf1 · aa71bf1
1 parent 3f3464a
commit aa71bf1
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -26,18 +26,18 @@ jobs:
     - uses: actions/checkout@v4
     - uses: haskell/actions/setup@v2
       with:
-        ghc-version: ${{ matrix.ghc }}
+        ghc-version: ${{ matrix.compiler.ghc }}
         cabal-version: '3.8.1.0'
     - run: cabal build all --enable-tests
     - run: cabal test all
 
   stack:
-    name: Stack / GHC ${{ matrix.ghc }}
+    name: Stack / Kubernetes ${{ matrix.k8s_release }} / GHC ${{ matrix.compiler.ghc }}
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        include:
+        compiler:
         - ghc: "8.10.7"
           yaml: "stack-8.10.7.yaml"
         - ghc: "9.0.2"
@@ -65,22 +65,22 @@ jobs:
 
     - uses: haskell-actions/setup@v2
       with:
-        ghc-version: ${{ matrix.ghc }}
+        ghc-version: ${{ matrix.compiler.ghc }}
         enable-stack: true
         stack-version: "latest"
 
     - uses: actions/cache@v4
       name: Cache ~/.stack
       with:
         path: ~/.stack
-        key: ${{ runner.os }}-${{ matrix.ghc }}-${{ matrix.yaml }}
+        key: ${{ runner.os }}-${{ matrix.compiler.ghc }}-${{ matrix.compiler.yaml }}
 
     - name: Build
       run: |
-        nix run .#set-stack-version -- "${matrix.k8s_release}" "${{matrix.yaml}}"
+        nix run .#set-stack-version -- "${matrix.k8s_release}" "${{matrix.compiler.yaml}}"
 
-        stack build --stack-yaml ${{matrix.yaml}} --system-ghc --test --bench --no-run-tests --no-run-benchmarks
+        stack build --stack-yaml ${{matrix.compiler.yaml}} --system-ghc --test --bench --no-run-tests --no-run-benchmarks
 
     - name: Test
       run: |
-        stack test --stack-yaml ${{matrix.yaml}} --system-ghc
+        stack test --stack-yaml ${{matrix.compiler.yaml}} --system-ghc