Add CI support for GHC 9.8.1

haskell · Nov 13, 2023 · f54f3f9 · f54f3f9
1 parent 2e2c8d7
commit f54f3f9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
@@ -15,21 +15,21 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ['9.6.2', '9.4.6', '9.2.8', '9.0.2', '8.10.7']
+        ghc: ['9.8.1', '9.6.3', '9.4.7', '9.2.8', '9.0.2', '8.10.7']
         os: [ubuntu-latest, macOS-latest, windows-latest]
 
     steps:
     - uses: actions/checkout@v4
     - id:   extra-ghc
       uses: haskell/actions/setup@v2
       with:
-        cabal-version: '3.8.1.0'
+        cabal-version: '3.10.2.0'
         ghc-version: '8.10.7'
 
     - uses: haskell/actions/setup@v2
       with:
         ghc-version: ${{ matrix.ghc }}
-        cabal-version: '3.8.1.0'
+        cabal-version: '3.10.2.0'
         enable-stack: true
 
     - name: Print extra ghc version

diff --git a/hie-bios.cabal b/hie-bios.cabal
@@ -139,7 +139,7 @@ Extra-Source-Files:     ChangeLog.md
                         tests/projects/stack-with-yaml/stack-with-yaml.cabal
                         tests/projects/stack-with-yaml/src/Lib.hs
 
-tested-with: GHC ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.6 || ==9.6.2
+tested-with: GHC ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.6 || ==9.6.2 || ==9.8.1
 
 Library
   Default-Language:     Haskell2010

diff --git a/tests/BiosTests.hs b/tests/BiosTests.hs
@@ -351,9 +351,9 @@ stackYaml resolver pkgs = unlines
 stackYamlResolver :: String
 stackYamlResolver =
 #if (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(9,6,2,0)))
-  "nightly-2023-08-22" -- GHC 9.6.2
+  "nightly-2023-11-13" -- GHC 9.6.3
 #elif (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(9,4,4,0)))
-  "lts-21.8" -- GHC 9.4.6
+  "lts-21.20" -- GHC 9.4.7
 #elif (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(9,2,7,0)))
   "lts-20.26" -- GHC 9.2.8
 #elif (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(9,2,1,0)))
@@ -423,12 +423,13 @@ ignoreToolTests = Tasty.TestManager [Tasty.Option (Proxy :: Proxy IgnoreToolDeps
 
 -- ------------------------------------------------------------------
 -- Ignore test group if built with GHC 9.2.1 until GHC 9.2.4
+-- or GHC 9.8.1 or newer.
 -- ------------------------------------------------------------------
 
 ignoreOnUnsupportedGhc :: TestTree -> TestTree
 ignoreOnUnsupportedGhc tt =
-#if (defined(MIN_VERSION_GLASGOW_HASKELL) && MIN_VERSION_GLASGOW_HASKELL(9,2,1,0) && !MIN_VERSION_GLASGOW_HASKELL(9,2,4,0))
-  ignoreTestBecause "Not supported on GHC >= 9.2.1 && < 9.2.4"
+#if (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(9,2,1,0) && !MIN_VERSION_GLASGOW_HASKELL(9,2,4,0)) || (MIN_VERSION_GLASGOW_HASKELL(9,8,1,0)))
+  ignoreTestBecause "Not supported on GHC >= 9.2.1 && < 9.2.4 || >= 9.8.1"
 #endif
   tt