Skip to content

Commit 3d106fe

Browse files
committed
Disable Haskell indexer for GHC <= 8.10
1 parent dc88a49 commit 3d106fe

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ jobs:
171171
- name: Build glean-clang
172172
run: make glean-clang
173173

174-
- if: matrix.ghc != '8.6.5'
174+
- if: matrix.ghc != '8.6.5' && matrix.ghc != '8.8.4' && matrix.ghc != '8.10.7'
175175
name: Build hie-indexer
176176
run: make glean-hie
177177

glean.cabal.in

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,12 @@ common fb-cpp
6565
common exe
6666
ghc-options: -threaded -rtsopts
6767

68+
common haskell-indexer
69+
if impl(ghc >= 9.2)
70+
buildable: True
71+
else
72+
buildable: False
73+
6874
flag clang
6975
default: False
7076

@@ -1101,11 +1107,7 @@ executable hack-derive
11011107

11021108
-- Haskell indexer via hie
11031109
executable hie-indexer
1104-
import: deps, fb-haskell, exe
1105-
if impl(ghc >= 8.8)
1106-
buildable: True
1107-
else
1108-
buildable: False
1110+
import: deps, fb-haskell, exe, haskell-indexer
11091111
hs-source-dirs: glean/lang/haskell
11101112
main-is: HieIndexer/Main.hs
11111113
other-modules:
@@ -2127,7 +2129,7 @@ test-suite glean-snapshot-hack
21272129
buildable: False
21282130

21292131
test-suite glean-snapshot-haskell
2130-
import: fb-haskell, fb-cpp, deps, exe
2132+
import: fb-haskell, fb-cpp, deps, exe, haskell-indexer
21312133
hs-source-dirs: glean/lang/haskell/tests
21322134
type: exitcode-stdio-1.0
21332135
main-is: Main.hs
@@ -2140,7 +2142,7 @@ test-suite glean-snapshot-haskell
21402142
glean:glean
21412143

21422144
test-suite glean-snapshot-codemarkup-haskell
2143-
import: fb-haskell, fb-cpp, deps, exe
2145+
import: fb-haskell, fb-cpp, deps, exe, haskell-indexer
21442146
hs-source-dirs: glean/lang/codemarkup/tests/haskell
21452147
type: exitcode-stdio-1.0
21462148
main-is: Main.hs
@@ -2342,7 +2344,7 @@ test-suite glass-regression-hack
23422344
buildable: False
23432345

23442346
test-suite glass-regression-haskell
2345-
import: glass-regression-deps, fb-haskell, deps, exe
2347+
import: glass-regression-deps, fb-haskell, deps, exe, haskell-indexer
23462348
type: exitcode-stdio-1.0
23472349
main-is: Glean/Glass/Regression/Haskell/Main.hs
23482350
ghc-options: -main-is Glean.Glass.Regression.Haskell.Main

0 commit comments

Comments
 (0)