Fixes and add CI

Author: wz1000

.github/actions/setup-build/action.yml

@@ -37,6 +37,7 @@ runs:
         ghc-version  : ${{ inputs.ghc   }}
         cabal-version: ${{ inputs.cabal }}
         enable-stack: false
+        ghcup-release-channel: "https://raw.githubusercontent.com/haskell/ghcup-metadata/b9fd40eef5a6409a0742a5a248cda0cc24510d45/ghcup-prereleases-0.0.7.yaml"
 
     - if: inputs.os == 'Windows'
       name: (Windows) Platform config

.github/workflows/supported-ghc-versions.json

@@ -1 +1 @@
-[ "9.4.4" , "9.2.5" , "9.0.2" , "8.10.7" ]
+[ "9.6.0.20230210", "9.4.4" , "9.2.5" , "9.0.2" , "8.10.7" ]

cabal.project

@@ -71,7 +71,9 @@ package *
 
 write-ghc-environment-files: never
 
-index-state: 2023-02-19T00:00:01Z
+-- head.hackage doesn't like index-state
+if impl(ghc < 9.5)
+  index-state: 2023-02-19T00:00:01Z
 
 constraints:
   -- For GHC 9.4, older versions of entropy fail to build on Windows

ghcide/src/Development/IDE/Core/Preprocessor.hs

@@ -204,7 +204,7 @@ runCpp env0 filename contents = withTempDir $ \dir -> do
             -- Happy case, file is not modified, so run CPP on it in-place
             -- which also makes things like relative #include files work
             -- and means location information is correct
-            doCpp env1 True filename out
+            doCpp env1 filename out
             liftIO $ Util.hGetStringBuffer out
 
         Just contents -> do
@@ -218,7 +218,7 @@ runCpp env0 filename contents = withTempDir $ \dir -> do
             let inp = dir </> "___GHCIDE_MAGIC___"
             withBinaryFile inp WriteMode $ \h ->
                 hPutStringBuffer h contents
-            doCpp env2 True inp out
+            doCpp env2 inp out
 
             -- Fix up the filename in lines like:
             -- # 1 "C:/Temp/extra-dir-914611385186/___GHCIDE_MAGIC___"

ghcide/src/Development/IDE/GHC/CPP.hs

@@ -27,6 +27,11 @@ import           GHC.Settings
 import qualified DriverPipeline                  as Pipeline
 import           ToolSettings
 #endif
+
+#if MIN_VERSION_ghc(9,5,0)
+import qualified GHC.SysTools.Cpp                as Pipeline
+#endif
+
 #if MIN_VERSION_ghc(9,3,0)
 import qualified GHC.Driver.Pipeline.Execute     as Pipeline
 #endif
@@ -40,12 +45,23 @@ addOptP f = alterToolSettings $ \s -> s
     fingerprintStrings ss = fingerprintFingerprints $ map fingerprintString ss
     alterToolSettings f dynFlags = dynFlags { toolSettings = f (toolSettings dynFlags) }
 
-doCpp :: HscEnv -> Bool -> FilePath -> FilePath -> IO ()
-doCpp env raw input_fn output_fn =
+doCpp :: HscEnv -> FilePath -> FilePath -> IO ()
+doCpp env input_fn output_fn =
+        -- See GHC commit a2f53ac8d968723417baadfab5be36a020ea6850
+        -- this function/Pipeline.doCpp previously had a raw parameter
+        -- always set to True that corresponded to these settings
+#if MIN_VERSION_ghc(9,2,0)
+
 #if MIN_VERSION_ghc(9,5,0)
-    void $ Pipeline.runCppPhase env input_fn output_fn -- TODO wz1000
+    let cpp_opts = Pipeline.CppOpts
+                 { cppUseCc = False
+                 , cppLinePragmas = True
+                 } in
 #elif MIN_VERSION_ghc(9,2,0)
-    Pipeline.doCpp (hsc_logger env) (hsc_tmpfs env) (hsc_dflags env) (hsc_unit_env env) raw input_fn output_fn
+    let cpp_opts = True in
+#endif
+    Pipeline.doCpp (hsc_logger env) (hsc_tmpfs env) (hsc_dflags env) (hsc_unit_env env) cpp_opts input_fn output_fn
+
 #else
     Pipeline.doCpp (hsc_dflags env) raw input_fn output_fn
 #endif