CI cabal: try GHC 9.10.1

agda · May 17, 2024 · 0f7b75e · 0f7b75e
1 parent d1582c1
commit 0f7b75e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/.github/workflows/cabal.yml b/.github/workflows/cabal.yml
@@ -22,7 +22,6 @@ jobs:
         access_token: ${{ github.token }}
   cabal:
     env:
-      CABAL_VER: ${{ matrix.cabal-ver || '3.10' }}
       FLAGS: ${{ matrix.cabal-flags || '--enable-tests -f enable-cluster-counting'
         }}
       GHC_VER: ${{ matrix.ghc-ver || '9.8.2' }}
@@ -39,7 +38,7 @@ jobs:
       uses: haskell-actions/setup@v2
       with:
         cabal-update: true
-        cabal-version: ${{ env.CABAL_VER }}
+        cabal-version: latest
         ghc-version: ${{ env.GHC_VER }}
     - if: runner.os == 'Windows'
       name: Install the ICU library (Windows)
@@ -102,13 +101,12 @@ jobs:
       matrix:
         cabal-flags:
         - --enable-tests -f enable-cluster-counting
-        cabal-ver:
-        - '3.10'
         description:
         - Linux
         doctest:
         - false
         ghc-ver:
+        - 9.10.1
         - 9.8.2
         - 9.6.5
         - 9.4.8

diff --git a/src/github/workflows/cabal.yml b/src/github/workflows/cabal.yml
@@ -50,9 +50,7 @@ jobs:
       matrix:
         os: [ubuntu-24.04]
         description: [Linux]      ## This just for pretty-printing the job name.
-        ghc-ver: [9.8.2, 9.6.5, 9.4.8, 9.2.8, 9.0.2, 8.10.7, 8.8.4, 8.6.5]
-        # Need to mention "cabal-ver" at least once in the matrix, otherwise matrix.cabal-ver is an actionlint error.
-        cabal-ver: ['3.10']
+        ghc-ver: [9.10.1, 9.8.2, 9.6.5, 9.4.8, 9.2.8, 9.0.2, 8.10.7, 8.8.4, 8.6.5]
         cabal-flags: ['--enable-tests -f enable-cluster-counting']
         doctest: [false]
         include:
@@ -96,7 +94,6 @@ jobs:
     # Default values
     env:
       GHC_VER:   ${{ matrix.ghc-ver || '9.8.2' }}
-      CABAL_VER: ${{ matrix.cabal-ver || '3.10' }}
       FLAGS:     ${{ matrix.cabal-flags || '--enable-tests -f enable-cluster-counting' }}
 
     steps:
@@ -112,7 +109,7 @@ jobs:
       id: setup-haskell
       with:
         ghc-version:   ${{ env.GHC_VER }}
-        cabal-version: ${{ env.CABAL_VER }}
+        cabal-version: latest
         cabal-update:  true
 
     # See: https://github.com/haskell/text-icu/pull/86