Use newer cabal-fmt, partially lift ghc version restriction

This commit is contained in:
Jan Hrček 2024-06-19 20:56:33 +02:00 committed by Michael Peyton Jones
parent e4128a4458
commit bd29bc52fb
2 changed files with 3 additions and 3 deletions

View File

@ -227,8 +227,8 @@ jobs:
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
## version needs to be limited since the tests depend on cabal-fmt which only builds using specific ghc versions
- if: matrix.test && matrix.ghc == '9.2' # TODO cabal-fmt only worked with 9.2? decide what to do with it
# 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.10'
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

View File

@ -152,7 +152,7 @@ test-suite hls-cabal-fmt-plugin-tests
, hls-test-utils == 2.9.0.0
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
-----------------------------