Skip to content

Commit 64f67f2

Browse files
committed
Resolve rebase issues
Maybe it's better to create merge commits instead?
1 parent a63acbc commit 64f67f2

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ jobs:
110110
run: cabal update
111111

112112
- if: ${{ needs.pre_job.outputs.should_skip != 'true' && matrix.ghc == '9.0.1' }}
113-
run: cabal configure --constraint "haskell-language-server -class -eval -tactic -moduleName -splice -fourmolu -ormolu -stylishHaskell -brittany"
113+
run: cabal configure --constraint "haskell-language-server -class -eval -refineImports -tactic -moduleName -splice -fourmolu -ormolu -stylishHaskell -brittany"
114114

115115
# Need this to work around filepath length limits in Windows
116116
- if: ${{ needs.pre_job.outputs.should_skip != 'true' }}

stack-9.0.1.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ packages:
1313
- ./plugins/hls-haddock-comments-plugin
1414
# - ./plugins/hls-eval-plugin
1515
- ./plugins/hls-explicit-imports-plugin
16-
- ./plugins/hls-refine-imports-plugin
16+
# - ./plugins/hls-refine-imports-plugin
1717
- ./plugins/hls-hlint-plugin
1818
- ./plugins/hls-retrie-plugin
1919
# - ./plugins/hls-splice-plugin
@@ -106,6 +106,7 @@ flags:
106106
eval: false
107107
class: false
108108
splice: false
109+
refineImports: false
109110
tactic: false # Dependencies fail
110111

111112
floskell: false

0 commit comments

Comments
 (0)