diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml index d0670dad77..c06920b0fa 100644 --- a/.github/workflows/bench.yml +++ b/.github/workflows/bench.yml @@ -48,7 +48,7 @@ jobs: matrix: ghc: - '8.10.7' - - '9.2.5' + - '9.2.7' os: - ubuntu-latest @@ -115,7 +115,7 @@ jobs: strategy: fail-fast: false matrix: - ghc: ['8.10.7', '9.2.5'] + ghc: ['8.10.7', '9.2.7'] os: [ubuntu-latest] cabal: ['3.6'] example: ['cabal', 'lsp-types'] diff --git a/.github/workflows/flags.yml b/.github/workflows/flags.yml index c23d777dcd..3a0eb64bc6 100644 --- a/.github/workflows/flags.yml +++ b/.github/workflows/flags.yml @@ -76,7 +76,7 @@ jobs: run: cabal v2-build ghcide --flags="ghc-patched-unboxed-bytecode test-exe executable bench-exe ekg" # we have to clean up warnings for 9.0 and 9.2 before enable -Wall - - if: matrix.ghc != '9.0.2' && matrix.ghc != '9.2.5' + - if: matrix.ghc != '9.0.2' && matrix.ghc != '9.2.7' name: Build with pedantic (-WError) run: cabal v2-build --flags="pedantic" diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index de2b6938c6..d8af955611 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -27,7 +27,7 @@ jobs: - uses: ./.github/actions/setup-build with: # select a stable GHC version - ghc: 9.2.5 + ghc: 9.2.7 os: ${{ runner.os }} shorten-hls: false diff --git a/.github/workflows/supported-ghc-versions.json b/.github/workflows/supported-ghc-versions.json index 9457d7d7bd..21a555cd19 100644 --- a/.github/workflows/supported-ghc-versions.json +++ b/.github/workflows/supported-ghc-versions.json @@ -1 +1 @@ -[ "9.6.1", "9.4.4" , "9.2.5" , "9.0.2" , "8.10.7" ] +[ "9.6.1", "9.4.4" , "9.2.7" , "9.0.2" , "8.10.7" ] diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1b1ce9c1d5..247795d811 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -154,7 +154,7 @@ jobs: name: Test hls-eval-plugin run: cabal test hls-eval-plugin --test-options="$TEST_OPTS" || cabal test hls-eval-plugin --test-options="$TEST_OPTS" - - if: matrix.test && matrix.ghc != '9.2.5' && matrix.ghc != '9.4.4' && matrix.ghc != '9.6.1' + - if: matrix.test && matrix.ghc != '9.2.7' && matrix.ghc != '9.4.4' && matrix.ghc != '9.6.1' name: Test hls-haddock-comments-plugin run: cabal test hls-haddock-comments-plugin --test-options="$TEST_OPTS" || cabal test hls-haddock-comments-plugin --test-options="$TEST_OPTS" @@ -174,7 +174,7 @@ jobs: name: Test hls-fourmolu-plugin run: cabal test hls-fourmolu-plugin --test-options="$TEST_OPTS" || cabal test hls-fourmolu-plugin --test-options="$TEST_OPTS" - - if: matrix.test && matrix.ghc != '9.2.5' && matrix.ghc != '9.4.4' && matrix.ghc != '9.6.1' + - if: matrix.test && matrix.ghc != '9.2.7' && matrix.ghc != '9.4.4' && matrix.ghc != '9.6.1' name: Test hls-tactics-plugin test suite run: cabal test hls-tactics-plugin --test-options="$TEST_OPTS" || cabal test hls-tactics-plugin --test-options="$TEST_OPTS" @@ -198,7 +198,7 @@ jobs: name: Test hls-hlint-plugin test suite run: cabal test hls-hlint-plugin --test-options="$TEST_OPTS" || cabal test hls-hlint-plugin --test-options="$TEST_OPTS" - - if: matrix.test && matrix.ghc != '9.0.2' && matrix.ghc != '9.2.5' && matrix.ghc != '9.4.4' && matrix.ghc != '9.6.1' + - if: matrix.test && matrix.ghc != '9.0.2' && matrix.ghc != '9.2.7' && matrix.ghc != '9.4.4' && matrix.ghc != '9.6.1' name: Test hls-stan-plugin test suite run: cabal test hls-stan-plugin --test-options="$TEST_OPTS" || cabal test hls-stan-plugin --test-options="$TEST_OPTS" diff --git a/ghcide/test/exe/Main.hs b/ghcide/test/exe/Main.hs index 7c58112b26..c690c0b9bd 100644 --- a/ghcide/test/exe/Main.hs +++ b/ghcide/test/exe/Main.hs @@ -1216,10 +1216,6 @@ findDefinitionAndHoverTests = let testM yes yes reexported reexportedSig "Imported symbol (reexported)" , if | ghcVersion == GHC90 && isWindows -> test no broken thLocL57 thLoc "TH Splice Hover" - | ghcVersion == GHC92 && (isWindows || isMac) -> - -- Some GHC 9.2 distributions ship without .hi docs - -- https://gitlab.haskell.org/ghc/ghc/-/issues/20903 - test no broken thLocL57 thLoc "TH Splice Hover" | otherwise -> test no yes thLocL57 thLoc "TH Splice Hover" ] @@ -2061,14 +2057,14 @@ completionDocTests = ] let expected = "*Imported from 'Prelude'*\n" test doc (Position 1 8) "odd" (Just $ T.length expected) [expected] - , brokenForMacGhc9 $ brokenForWinGhc9 $ testSession "extern single line doc without '\\n'" $ do + , brokenForMacGhc9 $ brokenForWinGhc90 $ testSession "extern single line doc without '\\n'" $ do doc <- createDoc "A.hs" "haskell" $ T.unlines [ "module A where" , "foo = no" ] let expected = "*Imported from 'Prelude'*\n* * *\n\n\nBoolean \"not\"\n" test doc (Position 1 8) "not" (Just $ T.length expected) [expected] - , brokenForMacGhc9 $ brokenForWinGhc9 $ testSession "extern mulit line doc" $ do + , brokenForMacGhc9 $ brokenForWinGhc90 $ testSession "extern mulit line doc" $ do doc <- createDoc "A.hs" "haskell" $ T.unlines [ "module A where" , "foo = i" @@ -2085,7 +2081,7 @@ completionDocTests = ] where brokenForGhc9 = knownBrokenFor (BrokenForGHC [GHC90, GHC92, GHC94, GHC96]) "Completion doc doesn't support ghc9" - brokenForWinGhc9 = knownBrokenFor (BrokenSpecific Windows [GHC90, GHC92]) "Extern doc doesn't support Windows for ghc9.2" + brokenForWinGhc90 = knownBrokenFor (BrokenSpecific Windows [GHC90]) "Extern doc doesn't support Windows for ghc9.2" -- https://gitlab.haskell.org/ghc/ghc/-/issues/20903 brokenForMacGhc9 = knownBrokenFor (BrokenSpecific MacOS [GHC90, GHC92, GHC94, GHC96]) "Extern doc doesn't support MacOS for ghc9" test doc pos label mn expected = do