Skip to content

Fix build and tests with GHC-9.4.3 and 9.2.5 #3364

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

Closed
wants to merge 16 commits into from
Closed

Fix build and tests with GHC-9.4.3 and 9.2.5 #3364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
efba374
Fix build and tests with GHC-9.4.3.
mouse07410 Nov 24, 2022
322c03b
Update .github/workflows/test.yml
mouse07410 Nov 24, 2022
5e51777
Address @pepeiborra suggestions
mouse07410 Nov 24, 2022
b3d0bd2
Address @pepeiborra suggestions
mouse07410 Nov 24, 2022
3e6d8ca
Merge branch 'master' of https://github.com/mouse07410/haskell-langua…
mouse07410 Nov 24, 2022
12efbd6
Disable GHC-9.4.3 on WIndows for now - test complains it can't instal…
mouse07410 Nov 24, 2022
4b5bdb8
Attempt to work around fourmolu 0.9.0.0 build failure in Windows test
mouse07410 Nov 25, 2022
f1e2481
Add build with GHC-9.2.5
mouse07410 Nov 25, 2022
eca61d1
Merge remote-tracking branch 'upstream/master'
mouse07410 Nov 25, 2022
4e489cb
Temporarily disable GHC-9.2.5 for Windows
mouse07410 Nov 25, 2022
362b8d2
Merge remote-tracking branch 'upstream/master'
mouse07410 Nov 27, 2022
23a6279
Update haskell-language-server.cabal
mouse07410 Nov 27, 2022
c359743
Merge remote-tracking branch 'upstream/master'
mouse07410 Nov 28, 2022
c6f1a0a
Merge remote-tracking branch 'upstream/master'
mouse07410 Dec 9, 2022
8a491f5
Merge branch 'master' into master
pepeiborra Dec 13, 2022
b474547
Merge branch 'master' into master
pepeiborra Dec 14, 2022
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
32 changes: 20 additions & 12 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ jobs:
- os: ubuntu-latest
ghc: '9.4.3'
test: true
# Probaby will fail, as the only supported GHC on Windows is 9.2.3
- os: ubuntu-latest
ghc: '9.2.5'
test: true
Expand All @@ -99,6 +100,13 @@ jobs:
- os: ubuntu-latest
ghc: '8.10.7'
test: true
#- os: windows-latest
# ghc: '9.4.3' # apparently cannot install GHC-9.4.3 on Windows?
# test: true
# Unclear why 9.2.5 fails the tests, but it does - disabling for now
#- os: windows-latest
# ghc: '9.2.5'
# test: true
- os: windows-latest
ghc: '9.4.2'
test: true
Expand Down Expand Up @@ -167,15 +175,15 @@ jobs:
HLS_WRAPPER_TEST_EXE: hls-wrapper
run: cabal test wrapper-test --test-options="$TEST_OPTS --rerun-log-file .tasty-rerun-log-wrapper"

- if: matrix.test && matrix.ghc != '9.2.4' && matrix.ghc != '9.2.5' && matrix.ghc != '9.4.2' && matrix.ghc != '9.4.3'
- if: matrix.test && matrix.ghc != '9.2.4' && matrix.ghc != '9.2.5' && matrix.ghc != '9.4.2' && matrix.ghc != '9.4.3'
name: Test hls-brittany-plugin
run: cabal test hls-brittany-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-brittany-plugin --test-options="$TEST_OPTS"

- if: matrix.test && matrix.ghc != '9.4.2' && matrix.ghc != '9.4.3'
- if: matrix.test && matrix.ghc != '9.4.3'
name: Test hls-refactor-plugin
run: cabal test hls-refactor-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-refactor-plugin --test-options="$TEST_OPTS"

- if: matrix.test && matrix.ghc != '9.4.2' && matrix.ghc != '9.4.3'
- if: matrix.test && matrix.ghc != '9.4.3'
name: Test hls-floskell-plugin
run: cabal test hls-floskell-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-floskell-plugin --test-options="$TEST_OPTS"

Expand All @@ -187,27 +195,27 @@ jobs:
name: Test hls-pragmas-plugin
run: cabal test hls-pragmas-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-pragmas-plugin --test-options="$TEST_OPTS"

- if: matrix.test && matrix.ghc != '9.4.2' && matrix.ghc != '9.4.3'
- if: matrix.test && matrix.ghc != '9.4.3'
name: Test hls-eval-plugin
run: cabal test hls-eval-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-eval-plugin --test-options="$TEST_OPTS"

- if: matrix.test && matrix.ghc != '9.2.4' && matrix.ghc != '9.2.5' && matrix.ghc != '9.4.2' && matrix.ghc != '9.4.3'
name: Test hls-haddock-comments-plugin
run: cabal test hls-haddock-comments-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-haddock-comments-plugin --test-options="$TEST_OPTS"

- if: matrix.test && matrix.ghc != '9.4.2' && matrix.ghc != '9.4.3'
- if: matrix.test && matrix.ghc != '9.4.3'
name: Test hls-splice-plugin
run: cabal test hls-splice-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-splice-plugin --test-options="$TEST_OPTS"

- if: matrix.test && matrix.ghc != '9.4.2' && matrix.ghc != '9.4.3'
- if: matrix.test && matrix.ghc != '9.4.3'
name: Test hls-stylish-haskell-plugin
run: cabal test hls-stylish-haskell-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-stylish-haskell-plugin --test-options="$TEST_OPTS"

- if: matrix.test && matrix.ghc != '9.4.2' && matrix.ghc != '9.4.3'
- if: matrix.test && matrix.ghc != '9.4.3'
name: Test hls-ormolu-plugin
run: cabal test hls-ormolu-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-ormolu-plugin --test-options="$TEST_OPTS"

- if: matrix.test && matrix.ghc != '9.4.2' && matrix.ghc != '9.4.3'
- if: matrix.test && matrix.ghc != '9.4.3'
name: Test hls-fourmolu-plugin
run: cabal test hls-fourmolu-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-fourmolu-plugin --test-options="$TEST_OPTS"

Expand All @@ -227,11 +235,11 @@ jobs:
name: Test hls-call-hierarchy-plugin test suite
run: cabal test hls-call-hierarchy-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-call-hierarchy-plugin --test-options="$TEST_OPTS"

- if: matrix.test && matrix.os != 'windows-latest' && matrix.ghc != '9.4.2' && matrix.ghc != '9.4.3'
- if: matrix.test && matrix.os != 'windows-latest' && matrix.ghc != '9.4.3'
name: Test hls-rename-plugin test suite
run: cabal test hls-rename-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-rename-plugin --test-options="$TEST_OPTS"

- if: matrix.test && matrix.ghc != '9.4.2' && matrix.ghc != '9.4.3'
- if: matrix.test && matrix.ghc != '9.4.3'
name: Test hls-hlint-plugin test suite
run: cabal test hls-hlint-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-hlint-plugin --test-options="$TEST_OPTS"

Expand All @@ -251,15 +259,15 @@ jobs:
name: Test hls-qualify-imported-names-plugin test suite
run: cabal test hls-qualify-imported-names-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-qualify-imported-names-plugin --test-options="$TEST_OPTS"

- if: matrix.test && matrix.ghc != '9.4.2' && matrix.ghc != '9.4.3'
- if: matrix.test
name: Test hls-code-range-plugin test suite
run: cabal test hls-code-range-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-code-range-plugin --test-options="$TEST_OPTS"

- if: matrix.test
name: Test hls-change-type-signature test suite
run: cabal test hls-change-type-signature-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-change-type-signature-plugin --test-options="$TEST_OPTS"

- if: matrix.test && matrix.ghc != '9.4.2' && matrix.ghc != '9.4.3'
- if: matrix.test && matrix.ghc != '9.4.3'
name: Test hls-gadt-plugin test suit
run: cabal test hls-gadt-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-gadt-plugin --test-options="$TEST_OPTS"

Expand Down
1 change: 1 addition & 0 deletions ghcide/ghcide.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ library
hashable,
hie-compat ^>= 0.3.0.0,
hls-plugin-api ^>= 1.5,
implicit-hie >= 0.1.2.7 && < 0.1.3,
lens,
list-t,
hiedb == 0.4.2.*,
Expand Down
3 changes: 3 additions & 0 deletions haskell-language-server.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,6 +497,9 @@ executable haskell-language-server

default-language: Haskell2010
default-extensions: DataKinds, TypeOperators

-- if impl(ghc >= 9.4)
-- build-depends: ghc-exactprint >= 1.6.1

executable haskell-language-server-wrapper
import: common-deps
Expand Down