Skip to content

Commit 027587b

Browse files
authored
Enable tests for ormolu plugin (#2086)
It was never enabled in github workflow. Also we should test it with GHC 9 now.
1 parent fe467e6 commit 027587b

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

.github/workflows/test.yml

+4
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,10 @@ jobs:
189189
name: Test hls-stylish-haskell-plugin
190190
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"
191191

192+
- if: ${{ needs.pre_job.outputs.should_skip != 'true' && matrix.test }}
193+
name: Test hls-ormolu-plugin
194+
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"
195+
192196
- if: ${{ needs.pre_job.outputs.should_skip != 'true' && matrix.test && matrix.ghc != '9.0.1' }}
193197
name: Test hls-fourmolu-plugin
194198
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"

cabal-ghc901.project

+3-4
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ packages:
2121
./plugins/hls-floskell-plugin
2222
./plugins/hls-pragmas-plugin
2323
./plugins/hls-module-name-plugin
24-
-- ./plugins/hls-ormolu-plugin
24+
./plugins/hls-ormolu-plugin
2525
./plugins/hls-call-hierarchy-plugin
2626
tests: true
2727

@@ -75,11 +75,11 @@ source-repository-package
7575

7676
write-ghc-environment-files: never
7777

78-
index-state: 2021-08-01T00:00:00Z
78+
index-state: 2021-08-08T02:21:16Z
7979

8080
constraints:
8181
-- These plugins doesn't work on GHC9 yet
82-
haskell-language-server -brittany -class -fourmolu -ormolu -splice -stylishhaskell -tactic -refineImports
82+
haskell-language-server -brittany -class -fourmolu -splice -stylishhaskell -tactic -refineImports
8383

8484

8585
allow-newer:
@@ -89,7 +89,6 @@ allow-newer:
8989
-- brittany:ghc-boot-th,
9090
-- butcher:base,
9191
-- fourmolu:ghc-lib-parser,
92-
-- ormolu:ghc-lib-parser,
9392
-- stylish-haskell:ghc-lib-parser,
9493
-- stylish-haskell:Cabal,
9594
-- multistate:base,

cabal.project

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ source-repository-package
3737

3838
write-ghc-environment-files: never
3939

40-
index-state: 2021-08-01T00:00:00Z
40+
index-state: 2021-08-08T02:21:16Z
4141

4242
constraints:
4343
-- Diagrams doesn't support optparse-applicative >= 0.16 yet

configuration-ghc-901.nix

-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ let
88
"hls-stylish-haskell-plugin"
99
"hls-fourmolu-plugin"
1010
"hls-splice-plugin"
11-
"hls-ormolu-plugin"
1211
"hls-class-plugin"
1312
"hls-refine-imports-plugin"
1413
];
@@ -92,7 +91,6 @@ let
9291
"-f-brittany"
9392
"-f-class"
9493
"-f-fourmolu"
95-
"-f-ormolu"
9694
"-f-splice"
9795
"-f-stylishhaskell"
9896
"-f-tactic"

0 commit comments

Comments
 (0)