Skip to content

Commit bd29bc5

Browse files
jhrcekmichaelpj
authored andcommitted
Use newer cabal-fmt, partially lift ghc version restriction
1 parent e4128a4 commit bd29bc5

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,8 +227,8 @@ jobs:
227227
name: Test hls-explicit-record-fields-plugin test suite
228228
run: cabal test hls-explicit-record-fields-plugin-tests || cabal test hls-explicit-record-fields-plugin-tests
229229

230-
## version needs to be limited since the tests depend on cabal-fmt which only builds using specific ghc versions
231-
- if: matrix.test && matrix.ghc == '9.2' # TODO cabal-fmt only worked with 9.2? decide what to do with it
230+
# versions need to be limited since the tests depend on cabal-fmt which only builds with ghc <9.10
231+
- if: matrix.test && matrix.ghc != '9.10'
232232
name: Test hls-cabal-fmt-plugin test suite
233233
run: cabal test hls-cabal-fmt-plugin-tests --flag=isolateCabalfmtTests || cabal test hls-cabal-fmt-plugin-tests --flag=isolateCabalfmtTests
234234

haskell-language-server.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ test-suite hls-cabal-fmt-plugin-tests
152152
, hls-test-utils == 2.9.0.0
153153

154154
if flag(isolateCabalfmtTests)
155-
build-tool-depends: cabal-fmt:cabal-fmt ^>=0.1.6
155+
build-tool-depends: cabal-fmt:cabal-fmt ^>=0.1.12
156156
cpp-options: -Dhls_isolate_cabalfmt_tests
157157

158158
-----------------------------

0 commit comments

Comments
 (0)