Fix more matrix variables

bellroy · Dec 10, 2024 · ab5d23a · ab5d23a
1 parent 9802142
commit ab5d23a
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml
@@ -60,9 +60,9 @@ jobs:
           echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
           echo "GHCJSARITH=0" >> "$GITHUB_ENV"
         env:
-          HCKIND: ${{ matrix.compilerKind }}
-          HCNAME: ${{ matrix.compiler }}
-          HCVER: ${{ matrix.compilerVersion }}
+          HCKIND: ghc
+          HCNAME: ghc-${{ matrix.ghc }}
+          HCVER: ${{ matrix.ghc }}
       - name: env
         run: |
           env
@@ -101,7 +101,7 @@ jobs:
       - name: cache (tools)
         uses: actions/cache/restore@v4
         with:
-          key: ${{ runner.os }}-${{ matrix.compiler }}-tools-ac1dc7e1
+          key: ${{ runner.os }}-${{ matrix.ghc }}-tools-ac1dc7e1
           path: ~/.haskell-ci-tools
       - name: install cabal-plan
         run: |
@@ -120,7 +120,7 @@ jobs:
         uses: actions/cache/save@v4
         if: always()
         with:
-          key: ${{ runner.os }}-${{ matrix.compiler }}-tools-ac1dc7e1
+          key: ${{ runner.os }}-${{ matrix.ghc }}-tools-ac1dc7e1
           path: ~/.haskell-ci-tools
       - name: checkout
         uses: actions/checkout@v4
@@ -161,9 +161,9 @@ jobs:
       - name: restore cache
         uses: actions/cache/restore@v4
         with:
-          key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
+          key: ${{ runner.os }}-${{ matrix.ghc }}-${{ github.sha }}
           path: ~/.cabal/store
-          restore-keys: ${{ runner.os }}-${{ matrix.compiler }}-
+          restore-keys: ${{ runner.os }}-${{ matrix.ghc }}-
       - name: install dependencies
         run: |
           $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --dependencies-only -j2 all
@@ -196,5 +196,5 @@ jobs:
         uses: actions/cache/save@v4
         if: always()
         with:
-          key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
+          key: ${{ runner.os }}-${{ matrix.ghc }}-${{ github.sha }}
           path: ~/.cabal/store