mirror of
https://github.com/haskell/haskell-language-server.git
synced 2024-10-05 12:49:07 +03:00
Use newer cabal-fmt, partially lift ghc version restriction
This commit is contained in:
parent
e4128a4458
commit
bd29bc52fb
4
.github/workflows/test.yml
vendored
4
.github/workflows/test.yml
vendored
@ -227,8 +227,8 @@ jobs:
|
|||||||
name: Test hls-explicit-record-fields-plugin test suite
|
name: Test hls-explicit-record-fields-plugin test suite
|
||||||
run: cabal test hls-explicit-record-fields-plugin-tests || cabal test hls-explicit-record-fields-plugin-tests
|
run: cabal test hls-explicit-record-fields-plugin-tests || cabal test hls-explicit-record-fields-plugin-tests
|
||||||
|
|
||||||
## version needs to be limited since the tests depend on cabal-fmt which only builds using specific ghc versions
|
# versions need to be limited since the tests depend on cabal-fmt which only builds with ghc <9.10
|
||||||
- if: matrix.test && matrix.ghc == '9.2' # TODO cabal-fmt only worked with 9.2? decide what to do with it
|
- if: matrix.test && matrix.ghc != '9.10'
|
||||||
name: Test hls-cabal-fmt-plugin test suite
|
name: Test hls-cabal-fmt-plugin test suite
|
||||||
run: cabal test hls-cabal-fmt-plugin-tests --flag=isolateCabalfmtTests || cabal test hls-cabal-fmt-plugin-tests --flag=isolateCabalfmtTests
|
run: cabal test hls-cabal-fmt-plugin-tests --flag=isolateCabalfmtTests || cabal test hls-cabal-fmt-plugin-tests --flag=isolateCabalfmtTests
|
||||||
|
|
||||||
|
@ -152,7 +152,7 @@ test-suite hls-cabal-fmt-plugin-tests
|
|||||||
, hls-test-utils == 2.9.0.0
|
, hls-test-utils == 2.9.0.0
|
||||||
|
|
||||||
if flag(isolateCabalfmtTests)
|
if flag(isolateCabalfmtTests)
|
||||||
build-tool-depends: cabal-fmt:cabal-fmt ^>=0.1.6
|
build-tool-depends: cabal-fmt:cabal-fmt ^>=0.1.12
|
||||||
cpp-options: -Dhls_isolate_cabalfmt_tests
|
cpp-options: -Dhls_isolate_cabalfmt_tests
|
||||||
|
|
||||||
-----------------------------
|
-----------------------------
|
||||||
|
Loading…
Reference in New Issue
Block a user