Require GHC 9.10.1

Author: sol

.github/workflows/build.yml

@@ -20,17 +20,13 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     strategy:
-      fail-fast: true
+      fail-fast: false
       matrix:
         os:
           - ubuntu-latest
+          - macos-latest
         ghc:
-          - '9.6'
-          - '9.8'
-          - '9.10'
-        include:
-          - os: macos-latest
-            ghc: '9.10'
+          - 9.10.1
     steps:
       - uses: actions/checkout@v4
       - uses: hspec/setup-haskell@v1
@@ -40,6 +36,14 @@ jobs:
         with:
           caching: true
 
+      - shell: bash
+        run: |
+          for GHC in 9.4 9.6 9.8
+          do
+            ghcup install ghc $GHC --no-set
+            SENSEI_GHC=ghc-$GHC $(cabal list-bin spec)
+          done
+
       - run: echo "name=sensei-$(uname -s)-$(uname -m).tar.gz" >> $GITHUB_OUTPUT
         id: archive
 
@@ -52,7 +56,6 @@ jobs:
           name: ${{ steps.archive.outputs.name }}
           path: ${{ steps.archive.outputs.name }}
           compression-level: 0
-        if: matrix.ghc == '9.10'
 
   success:
     needs: build

cabal.project

@@ -1,3 +1,5 @@
+with-compiler: ghc-9.10.1
+
 packages: .
 
 program-options

src/Language/Haskell/GhciWrapper.hs

@@ -13,6 +13,7 @@ module Language.Haskell.GhciWrapper (
 , reload
 
 #ifdef TEST
+, sensei_ghc
 , sensei_ghc_version
 , lookupGhc
 , lookupGhcVersion
@@ -41,8 +42,11 @@ import qualified GHC.Diagnostic as Diagnostic
 sensei_ghc_version :: String
 sensei_ghc_version = "SENSEI_GHC_VERSION"
 
+sensei_ghc :: String
+sensei_ghc = "SENSEI_GHC"
+
 lookupGhc :: [(String, String)] -> FilePath
-lookupGhc = fromMaybe "ghc" . lookup "SENSEI_GHC"
+lookupGhc = fromMaybe "ghc" . lookup sensei_ghc
 
 lookupGhcVersion :: [(String, String)] -> Maybe String
 lookupGhcVersion = lookup sensei_ghc_version

test/Helper.hs

@@ -30,6 +30,8 @@ module Helper (
 , to_json
 
 , requireGhc
+, ifGhc
+
 , ensureFile
 ) where
 
@@ -150,10 +152,18 @@ to_json :: ToJSON a => a -> ByteString
 to_json = toStrict . encode
 
 requireGhc :: [Int] -> IO ()
-requireGhc (makeVersion -> required) = do
+requireGhc = ifGhc >=> (`unless` pending)
+
+ifGhc :: [Int] -> IO Bool
+ifGhc (makeVersion -> required) = do
+  ghcVersion <- getGhcVersion
+  return (ghcVersion >= required)
+
+getGhcVersion :: IO Version
+getGhcVersion = do
   env <- getEnvironment
   let Just ghcVersion = lookupGhcVersion env >>= parseVersion
-  when (ghcVersion < required) pending
+  return ghcVersion
 
 ensureFile :: FilePath -> ByteString -> IO ()
 ensureFile name new = do

test/Language/Haskell/GhciWrapperSpec.hs

@@ -155,15 +155,16 @@ spec = do
       withModule \ file -> do
         withInterpreter [file] \ ghci -> do
           failingModule file
-          snd <$> Interpreter.reload ghci `shouldReturn` (Failed, [
-#if __GLASGOW_HASKELL__ >= 910
-              Annotated diagnostic {
-                span = Just $ Span file (Location 2 7) (Location 2 10)
-              , code = Just 88464
-              , message = ["Variable not in scope: bar"]
-              } (Just $ NotInScope "bar") []
-#endif
-            ])
+          diagnostics <- ifGhc [9,10] <&> \ case
+            True -> [
+                Annotated diagnostic {
+                  span = Just $ Span file (Location 2 7) (Location 2 10)
+                , code = Just 88464
+                , message = ["Variable not in scope: bar"]
+                } (Just $ NotInScope "bar") []
+              ]
+            False -> []
+          snd <$> Interpreter.reload ghci `shouldReturn` (Failed, diagnostics)
 
     context "with -fno-diagnostics-as-json" $ do
       it "does not extract diagnostics" do

test/SpecHook.hs

@@ -22,6 +22,7 @@ getGhcVersion ghc = do
 
 setPackageEnvironment :: IO ()
 setPackageEnvironment = do
+  lookupEnv ("SENSEI_GHC_TEST") >>= maybe pass (setEnv Interpreter.sensei_ghc)
   dir <- getCurrentDirectory
   env <- getEnvironment
   let ghc = Interpreter.lookupGhc env

test/TriggerSpec.hs

@@ -3,6 +3,8 @@ module TriggerSpec (spec) where
 
 import           Helper
 
+import qualified Data.Text as Text
+
 import qualified Session
 import           Session (Session)
 import           Language.Haskell.GhciWrapper (Config(..))
@@ -11,7 +13,7 @@ import           Trigger hiding (trigger, triggerAll)
 import qualified Trigger
 
 normalize :: String -> [String]
-normalize = normalizeTiming . lines
+normalize = normalizeTiming . lines . forGhc9dot4
   where
     normalizeTiming :: [String] -> [String]
     normalizeTiming = normalizeLine "Finished in "
@@ -23,6 +25,11 @@ normalize = normalizeTiming . lines
           | message `isPrefixOf` line = message ++ "..."
           | otherwise = line
 
+    forGhc9dot4 :: String -> String
+    forGhc9dot4 = Text.unpack
+      . Text.replace " error: Variable not in scope: " " error: [GHC-88464] Variable not in scope: "
+      . Text.pack
+
 withSession :: FilePath -> [String] -> (Session -> IO a) -> IO a
 withSession specPath args = do
   Session.withSession ghciConfig {configWorkingDirectory = Just dir} $
@@ -155,19 +162,14 @@ spec = do
       it "stops after reloading" $ \ name -> do
         withSession name [] $ \ session -> do
           writeFile name (passingSpec ++ "foo = bar")
-          (trigger session >> trigger session) `shouldReturn` (Failure, [
+
+          let
+            fitterNotNull :: [String] -> [String]
+            fitterNotNull = filter (not . null)
+
+          (fmap fitterNotNull <$> (trigger session >> trigger session)) `shouldReturn` (Failure, [
               "[1 of 1] Compiling Spec"
-#if __GLASGOW_HASKELL__ < 910
-            , ""
-#endif
-#if __GLASGOW_HASKELL__ >= 906
             , "Spec.hs:9:7: error: [GHC-88464] Variable not in scope: bar"
-#else
-            , "Spec.hs:9:7: error: Variable not in scope: bar"
-#endif
-#if __GLASGOW_HASKELL__ >= 910
-            , ""
-#endif
             , withColor Red "RELOADING FAILED"
             ])