Skip to content

CI: GHC 9.2.7 Support #3512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
May 8, 2023
Merged

CI: GHC 9.2.7 Support #3512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
649ae2d
Initial change to ghc 9.2.7
andys8 Mar 3, 2023
0bf1f7e
Merge branch 'master' into ghc-927
michaelpj Apr 24, 2023
83da7b9
Merge branch 'master' into ghc-927
mergify[bot] Apr 26, 2023
204b649
Merge branch 'master' into ghc-927
mergify[bot] May 5, 2023
e862162
Merge branch 'master' into ghc-927
mergify[bot] May 5, 2023
6b5eb41
Merge branch 'master' into ghc-927
fendor May 8, 2023
83eb07b
No longer mark tests as broken for windows GHC 9.2.7
fendor May 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/bench.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
matrix:
ghc:
- '8.10.7'
- '9.2.5'
- '9.2.7'
os:
- ubuntu-latest

Expand Down Expand Up @@ -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']
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/flags.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pre-commit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/supported-ghc-versions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" ]
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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"

Expand All @@ -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"

Expand Down
10 changes: 3 additions & 7 deletions ghcide/test/exe/Main.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
Expand Down Expand Up @@ -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"
Expand All @@ -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
Expand Down