Merge pull request #79 from tweag/cb/ghc-9.6.2

Support GHC 9.6
tweag · Jan 3, 2024 · 223b51f · 223b51f
2 parents 7dbe985 + bbcb0c2
commit 223b51f
Show file tree

Hide file tree

Showing 6 changed files with 73 additions and 3 deletions.
diff --git a/.bazelrc b/.bazelrc
@@ -17,6 +17,8 @@ common:ghc_9_2_7 --repo_env=GHC_VERSION=9.2.7
 
 common:ghc_9_4_5 --repo_env=GHC_VERSION=9.4.5
 
+common:ghc_9_6_2 --repo_env=GHC_VERSION=9.6.2
+
 common:bzlmod --enable_bzlmod
 
 # Try to load a file that includes the remote cache authentication flag

diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml
@@ -22,7 +22,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        ghc-version: [ghc_8_10_7, ghc_9_0_2, ghc_9_2_7, ghc_9_4_5]
+        ghc-version: [ghc_8_10_7, ghc_9_0_2, ghc_9_2_7, ghc_9_4_5, ghc_9_6_2]
         enable-bzlmod: [false]
         include:
           - os: ubuntu-latest
@@ -31,6 +31,9 @@ jobs:
           - os: ubuntu-latest
             ghc-version: ghc_9_4_5
             enable-bzlmod: true
+          - os: ubuntu-latest
+            ghc-version: ghc_9_6_2
+            enable-bzlmod: true
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4

diff --git a/cabalscan/src/Cabal/Cabal_9_4.hs b/cabalscan/src/Cabal/Cabal_9_4.hs
@@ -1,6 +1,6 @@
 {-#LANGUAGE CPP #-}
 
-#if __GLASGOW_HASKELL__ == 904
+#if __GLASGOW_HASKELL__ >= 904
 
 module Cabal.Cabal_9_4(module Cabal, depLibraries, hsSourceDirs)
 

diff --git a/cabalscan/src/CabalScan/RuleGenerator.hs b/cabalscan/src/CabalScan/RuleGenerator.hs
@@ -35,10 +35,14 @@ import qualified Cabal.Cabal_9_0 as Cabal
 
 import qualified Cabal.Cabal_9_2 as Cabal
 
-#else
+#elif __GLASGOW_HASKELL__ >= 904
 
 import qualified Cabal.Cabal_9_4 as Cabal
 
+#else
+
+#error GHC version __GLASGOW_HASKELL__ not supported
+
 #endif
 
 generateRulesForCabalFile :: FilePath -> IO [RuleInfo]