Skip to content

Commit

Permalink
Enable tests for ormolu plugin (#2086)
Browse files Browse the repository at this point in the history
It was never enabled in github workflow.

Also we should test it with GHC 9 now.
  • Loading branch information
felixonmars committed Aug 8, 2021
1 parent fe467e6 commit 027587b
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/test.yml
Expand Up @@ -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"
Expand Down
7 changes: 3 additions & 4 deletions cabal-ghc901.project
Expand Up @@ -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

Expand Down Expand Up @@ -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:
Expand All @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion cabal.project
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions configuration-ghc-901.nix
Expand Up @@ -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"
];
Expand Down Expand Up @@ -92,7 +91,6 @@ let
"-f-brittany"
"-f-class"
"-f-fourmolu"
"-f-ormolu"
"-f-splice"
"-f-stylishhaskell"
"-f-tactic"
Expand Down

0 comments on commit 027587b

Please sign in to comment.