Skip to content

Commit 86f0d02

Browse files
authored
CI: GHC 9.2.7 Support (#3512)
Solves #3511
1 parent 5d37f1c commit 86f0d02

File tree

6 files changed

+11
-15
lines changed

6 files changed

+11
-15
lines changed

.github/workflows/bench.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
matrix:
4949
ghc:
5050
- '8.10.7'
51-
- '9.2.5'
51+
- '9.2.7'
5252
os:
5353
- ubuntu-latest
5454

@@ -115,7 +115,7 @@ jobs:
115115
strategy:
116116
fail-fast: false
117117
matrix:
118-
ghc: ['8.10.7', '9.2.5']
118+
ghc: ['8.10.7', '9.2.7']
119119
os: [ubuntu-latest]
120120
cabal: ['3.6']
121121
example: ['cabal', 'lsp-types']

.github/workflows/flags.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
run: cabal v2-build ghcide --flags="ghc-patched-unboxed-bytecode test-exe executable bench-exe ekg"
7777

7878
# we have to clean up warnings for 9.0 and 9.2 before enable -Wall
79-
- if: matrix.ghc != '9.0.2' && matrix.ghc != '9.2.5'
79+
- if: matrix.ghc != '9.0.2' && matrix.ghc != '9.2.7'
8080
name: Build with pedantic (-WError)
8181
run: cabal v2-build --flags="pedantic"
8282

.github/workflows/pre-commit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- uses: ./.github/actions/setup-build
2828
with:
2929
# select a stable GHC version
30-
ghc: 9.2.5
30+
ghc: 9.2.7
3131
os: ${{ runner.os }}
3232
shorten-hls: false
3333

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[ "9.6.1", "9.4.4" , "9.2.5" , "9.0.2" , "8.10.7" ]
1+
[ "9.6.1", "9.4.4" , "9.2.7" , "9.0.2" , "8.10.7" ]

.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ jobs:
154154
name: Test hls-eval-plugin
155155
run: cabal test hls-eval-plugin --test-options="$TEST_OPTS" || cabal test hls-eval-plugin --test-options="$TEST_OPTS"
156156

157-
- if: matrix.test && matrix.ghc != '9.2.5' && matrix.ghc != '9.4.4' && matrix.ghc != '9.6.1'
157+
- if: matrix.test && matrix.ghc != '9.2.7' && matrix.ghc != '9.4.4' && matrix.ghc != '9.6.1'
158158
name: Test hls-haddock-comments-plugin
159159
run: cabal test hls-haddock-comments-plugin --test-options="$TEST_OPTS" || cabal test hls-haddock-comments-plugin --test-options="$TEST_OPTS"
160160

@@ -174,7 +174,7 @@ jobs:
174174
name: Test hls-fourmolu-plugin
175175
run: cabal test hls-fourmolu-plugin --test-options="$TEST_OPTS" || cabal test hls-fourmolu-plugin --test-options="$TEST_OPTS"
176176

177-
- if: matrix.test && matrix.ghc != '9.2.5' && matrix.ghc != '9.4.4' && matrix.ghc != '9.6.1'
177+
- if: matrix.test && matrix.ghc != '9.2.7' && matrix.ghc != '9.4.4' && matrix.ghc != '9.6.1'
178178
name: Test hls-tactics-plugin test suite
179179
run: cabal test hls-tactics-plugin --test-options="$TEST_OPTS" || cabal test hls-tactics-plugin --test-options="$TEST_OPTS"
180180

@@ -198,7 +198,7 @@ jobs:
198198
name: Test hls-hlint-plugin test suite
199199
run: cabal test hls-hlint-plugin --test-options="$TEST_OPTS" || cabal test hls-hlint-plugin --test-options="$TEST_OPTS"
200200

201-
- if: matrix.test && matrix.ghc != '9.0.2' && matrix.ghc != '9.2.5' && matrix.ghc != '9.4.4' && matrix.ghc != '9.6.1'
201+
- if: matrix.test && matrix.ghc != '9.0.2' && matrix.ghc != '9.2.7' && matrix.ghc != '9.4.4' && matrix.ghc != '9.6.1'
202202
name: Test hls-stan-plugin test suite
203203
run: cabal test hls-stan-plugin --test-options="$TEST_OPTS" || cabal test hls-stan-plugin --test-options="$TEST_OPTS"
204204

ghcide/test/exe/Main.hs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1216,10 +1216,6 @@ findDefinitionAndHoverTests = let
12161216
testM yes yes reexported reexportedSig "Imported symbol (reexported)"
12171217
, if | ghcVersion == GHC90 && isWindows ->
12181218
test no broken thLocL57 thLoc "TH Splice Hover"
1219-
| ghcVersion == GHC92 && (isWindows || isMac) ->
1220-
-- Some GHC 9.2 distributions ship without .hi docs
1221-
-- https://gitlab.haskell.org/ghc/ghc/-/issues/20903
1222-
test no broken thLocL57 thLoc "TH Splice Hover"
12231219
| otherwise ->
12241220
test no yes thLocL57 thLoc "TH Splice Hover"
12251221
]
@@ -2061,14 +2057,14 @@ completionDocTests =
20612057
]
20622058
let expected = "*Imported from 'Prelude'*\n"
20632059
test doc (Position 1 8) "odd" (Just $ T.length expected) [expected]
2064-
, brokenForMacGhc9 $ brokenForWinGhc9 $ testSession "extern single line doc without '\\n'" $ do
2060+
, brokenForMacGhc9 $ brokenForWinGhc90 $ testSession "extern single line doc without '\\n'" $ do
20652061
doc <- createDoc "A.hs" "haskell" $ T.unlines
20662062
[ "module A where"
20672063
, "foo = no"
20682064
]
20692065
let expected = "*Imported from 'Prelude'*\n* * *\n\n\nBoolean \"not\"\n"
20702066
test doc (Position 1 8) "not" (Just $ T.length expected) [expected]
2071-
, brokenForMacGhc9 $ brokenForWinGhc9 $ testSession "extern mulit line doc" $ do
2067+
, brokenForMacGhc9 $ brokenForWinGhc90 $ testSession "extern mulit line doc" $ do
20722068
doc <- createDoc "A.hs" "haskell" $ T.unlines
20732069
[ "module A where"
20742070
, "foo = i"
@@ -2085,7 +2081,7 @@ completionDocTests =
20852081
]
20862082
where
20872083
brokenForGhc9 = knownBrokenFor (BrokenForGHC [GHC90, GHC92, GHC94, GHC96]) "Completion doc doesn't support ghc9"
2088-
brokenForWinGhc9 = knownBrokenFor (BrokenSpecific Windows [GHC90, GHC92]) "Extern doc doesn't support Windows for ghc9.2"
2084+
brokenForWinGhc90 = knownBrokenFor (BrokenSpecific Windows [GHC90]) "Extern doc doesn't support Windows for ghc9.2"
20892085
-- https://gitlab.haskell.org/ghc/ghc/-/issues/20903
20902086
brokenForMacGhc9 = knownBrokenFor (BrokenSpecific MacOS [GHC90, GHC92, GHC94, GHC96]) "Extern doc doesn't support MacOS for ghc9"
20912087
test doc pos label mn expected = do

0 commit comments

Comments
 (0)