diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8cf842ad7b..3a02d2763d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -189,6 +189,10 @@ jobs: name: Test hls-stylish-haskell-plugin run: cabal test hls-stylish-haskell-plugin --test-options="-j1 --rerun-update" || cabal test hls-stylish-haskell-plugin --test-options="-j1 --rerun" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-stylish-haskell-plugin --test-options="-j1 --rerun" + - if: ${{ needs.pre_job.outputs.should_skip != 'true' && matrix.test }} + name: Test hls-ormolu-plugin + run: cabal test hls-ormolu-plugin --test-options="-j1 --rerun-update" || cabal test hls-ormolu-plugin --test-options="-j1 --rerun" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-ormolu-plugin --test-options="-j1 --rerun" + - if: ${{ needs.pre_job.outputs.should_skip != 'true' && matrix.test && matrix.ghc != '9.0.1' }} name: Test hls-fourmolu-plugin run: cabal test hls-fourmolu-plugin --test-options="-j1 --rerun-update" || cabal test hls-fourmolu-plugin --test-options="-j1 --rerun" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-fourmolu-plugin --test-options="-j1 --rerun" diff --git a/cabal-ghc901.project b/cabal-ghc901.project index 02f1519de0..5cd90914b3 100644 --- a/cabal-ghc901.project +++ b/cabal-ghc901.project @@ -21,7 +21,7 @@ packages: ./plugins/hls-floskell-plugin ./plugins/hls-pragmas-plugin ./plugins/hls-module-name-plugin - -- ./plugins/hls-ormolu-plugin + ./plugins/hls-ormolu-plugin ./plugins/hls-call-hierarchy-plugin tests: true @@ -75,11 +75,11 @@ source-repository-package write-ghc-environment-files: never -index-state: 2021-08-01T00:00:00Z +index-state: 2021-08-08T02:21:16Z constraints: -- These plugins doesn't work on GHC9 yet - haskell-language-server -brittany -class -fourmolu -ormolu -splice -stylishhaskell -tactic -refineImports + haskell-language-server -brittany -class -fourmolu -splice -stylishhaskell -tactic -refineImports allow-newer: @@ -89,7 +89,6 @@ allow-newer: -- brittany:ghc-boot-th, -- butcher:base, -- fourmolu:ghc-lib-parser, - -- ormolu:ghc-lib-parser, -- stylish-haskell:ghc-lib-parser, -- stylish-haskell:Cabal, -- multistate:base, diff --git a/cabal.project b/cabal.project index bd27b788ac..b0fbffe75d 100644 --- a/cabal.project +++ b/cabal.project @@ -37,7 +37,7 @@ source-repository-package write-ghc-environment-files: never -index-state: 2021-08-01T00:00:00Z +index-state: 2021-08-08T02:21:16Z constraints: -- Diagrams doesn't support optparse-applicative >= 0.16 yet diff --git a/configuration-ghc-901.nix b/configuration-ghc-901.nix index f0078aa09f..7f3d38554c 100644 --- a/configuration-ghc-901.nix +++ b/configuration-ghc-901.nix @@ -8,7 +8,6 @@ let "hls-stylish-haskell-plugin" "hls-fourmolu-plugin" "hls-splice-plugin" - "hls-ormolu-plugin" "hls-class-plugin" "hls-refine-imports-plugin" ]; @@ -92,7 +91,6 @@ let "-f-brittany" "-f-class" "-f-fourmolu" - "-f-ormolu" "-f-splice" "-f-stylishhaskell" "-f-tactic"