Require GHC 9.10.1

.github/workflows/build.yml

@@ -20,14 +20,10 @@ jobs:
       matrix:
         os:
           - ubuntu-latest
+          - macos-12
         ghc:
-          - '9.4'
-          - '9.6'
-          - '9.8'
           - '9.10'
-        include:
-          - os: macos-12
-            ghc: system
+
     steps:
       - uses: actions/checkout@v3
       - uses: hspec/setup-haskell@v1
@@ -54,12 +50,13 @@ jobs:
         run: cabal build all
 
       - shell: bash
-        run: echo | cabal repl sensei --build-depends hspec-meta
-
-      - shell: bash
-        run: cabal exec -- $(cabal list-bin spec) --times --print-slow
-        env:
-          HSPEC_OPTIONS: --color
+        run: |
+          for GHC in 9.4 9.6 9.8 9.10
+          do
+            ghcup install ghc $GHC --no-set
+            cabal install -z -w ghc-$GHC --package-env=./$GHC.env --lib hspec hspec-meta
+            SENSEI_GHC=ghc-$GHC GHC_ENVIRONMENT=$(pwd)/$GHC.env $(cabal list-bin spec)
+          done
 
   success:
     needs: build

cabal.project

@@ -1,3 +1,5 @@
+with-compiler: ghc-9.10.1
+
 packages:
   sensei.cabal
 

package.yaml

@@ -40,7 +40,7 @@ dependencies:
   - async
   - containers
   - transformers
-  - mtl
+  - mtl >= 2.3.1
   - aeson
   - yaml
   - casing

src/Language/Haskell/GhciWrapper.hs

@@ -82,16 +82,19 @@ new startupFile Config{..} envDefaults args_ = do
 
   let
     mandatoryArgs :: [String]
-    mandatoryArgs = ["-fshow-loaded-modules"]
+    mandatoryArgs = ["-fshow-loaded-modules", "--interactive"]
 
     args :: [String]
     args = "-ghci-script" : startupFile : args_ ++ catMaybes [
         if configIgnoreDotGhci then Just "-ignore-dot-ghci" else Nothing
       ] ++ mandatoryArgs
 
+    ghc :: String
+    ghc = fromMaybe "ghc" $ lookup "SENSEI_GHC" env
+
   (stdoutReadEnd, stdoutWriteEnd) <- createPipe
 
-  (Just stdin_, Nothing, Nothing, processHandle ) <- createProcess (proc "ghci" args) {
+  (Just stdin_, Nothing, Nothing, processHandle ) <- createProcess (proc ghc args) {
     cwd = configWorkingDirectory
   , env = Just $ envDefaults ++ env
   , std_in  = CreatePipe

src/Trigger.hs

@@ -14,12 +14,8 @@ module Trigger (
 
 import           Imports
 
-#if MIN_VERSION_mtl(2,3,1)
 import           Control.Monad.Trans.Writer.CPS (runWriterT)
 import           Control.Monad.Writer.CPS hiding (pass)
-#else
-import           Control.Monad.Writer.Strict hiding (pass)
-#endif
 
 import           Control.Monad.Except
 

test/ClientSpec.hs

@@ -32,7 +32,7 @@ spec = do
 
     it "indicates failure" $ do
       withFailure $ \ dir -> do
-        client dir [] `shouldReturn` (False, "failure")
+        client dir ["--color"] `shouldReturn` (False, fromString $ withColor Red "failure")
 
     context "when server socket is missing" $ do
       it "reports error" $ do

test/Language/Haskell/GhciWrapperSpec.hs

@@ -121,7 +121,7 @@ spec = do
 
     context "with -XNoImplicitPrelude" $ do
       it "works" $ withInterpreter ["-XNoImplicitPrelude"] $ \ ghci -> do
-        Interpreter.eval ghci "putStrLn \"foo\"" >>= (`shouldContain` "Variable not in scope: putStrLn")
+        (unwords . map (dropWhile isSpace) . lines <$> Interpreter.eval ghci "putStrLn \"foo\"") >>= (`shouldContain` "Variable not in scope: putStrLn")
         Interpreter.eval ghci "23" `shouldReturn` "23\n"
 
   describe "reload" do

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"
             ])