Skip to content

Commit e3d38b0

Browse files
authored
Bump CI to GHC 9.10.2 (#4687)
1 parent d18697c commit e3d38b0

File tree

5 files changed

+10
-6
lines changed

5 files changed

+10
-6
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ runs:
3131
sudo chown -R $USER /usr/local/.ghcup
3232
shell: bash
3333

34-
- uses: haskell-actions/setup@v2.7.10
34+
- uses: haskell-actions/setup@v2.8.1
3535
id: HaskEnvSetup
3636
with:
3737
ghc-version : ${{ inputs.ghc }}

.github/workflows/bench.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ jobs:
127127
example: ['cabal', 'lsp-types']
128128

129129
steps:
130-
- uses: haskell-actions/setup@v2.8.0
130+
- uses: haskell-actions/setup@v2.8.1
131131
with:
132132
ghc-version : ${{ matrix.ghc }}
133133
cabal-version: ${{ matrix.cabal }}

haskell-language-server.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ copyright: The Haskell IDE Team
1414
license: Apache-2.0
1515
license-file: LICENSE
1616
build-type: Simple
17-
tested-with: GHC == {9.12.2, 9.10.1, 9.8.4, 9.6.7}
17+
tested-with: GHC == {9.12.2, 9.10.2, 9.8.4, 9.6.7}
1818
extra-source-files:
1919
README.md
2020
ChangeLog.md

plugins/hls-eval-plugin/test/testdata/TPropertyError.ghc910.expected.hs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@ module TProperty where
1111
-- badHead, called at libraries/ghc-internal/src/GHC/Internal/List.hs:90:28 in ghc-internal:GHC.Internal.List
1212
-- head, called at <interactive>:1:27 in interactive:Ghci2
1313
-- HasCallStack backtrace:
14-
-- collectBacktraces, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:92:13 in ghc-internal:GHC.Internal.Exception
15-
-- toExceptionWithBacktrace, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:128:3 in ghc-internal:GHC.Internal.Exception
14+
-- collectBacktraces, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:169:13 in ghc-internal:GHC.Internal.Exception
15+
-- toExceptionWithBacktrace, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:204:5 in ghc-internal:GHC.Internal.Exception
16+
-- error, called at libraries/ghc-internal/src/GHC/Internal/List.hs:2030:3 in ghc-internal:GHC.Internal.List
17+
-- errorEmptyList, called at libraries/ghc-internal/src/GHC/Internal/List.hs:96:11 in ghc-internal:GHC.Internal.List
18+
-- badHead, called at libraries/ghc-internal/src/GHC/Internal/List.hs:90:28 in ghc-internal:GHC.Internal.List
19+
-- head, called at <interactive>:1:27 in interactive:Ghci2
1620
--
1721
-- []

plugins/hls-refactor-plugin/test/Main.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3379,7 +3379,7 @@ addSigActionTests = let
33793379
executeCodeAction chosenAction
33803380
modifiedCode <- documentContents doc
33813381
liftIO $ expectedCode @=? modifiedCode
3382-
issue806 = if ghcVersion >= GHC912 then
3382+
issue806 = if ghcVersion >= GHC910 then
33833383
"hello = print" >:: "hello :: GHC.Types.ZonkAny 0 -> IO ()" -- GHC now returns ZonkAny 0 instead of Any. https://gitlab.haskell.org/ghc/ghc/-/issues/25895
33843384
else
33853385
"hello = print" >:: "hello :: GHC.Types.Any -> IO ()" -- Documents current behavior outlined in #806

0 commit comments

Comments
 (0)