From bd29bc52fb3bb2092a1dc1494b4488fde0e1b2e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Hr=C4=8Dek?= Date: Wed, 19 Jun 2024 20:56:33 +0200 Subject: [PATCH] Use newer cabal-fmt, partially lift ghc version restriction --- .github/workflows/test.yml | 4 ++-- haskell-language-server.cabal | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4cb22adbd..50039becb 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -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 diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal index d96f28ae9..35d89e87b 100644 --- a/haskell-language-server.cabal +++ b/haskell-language-server.cabal @@ -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 -----------------------------