Skip to content

Commit 304f047

Browse files
committed
Disable Haskell indexer for GHC <= 8.10
1 parent 222b820 commit 304f047

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

@@ -1100,11 +1106,7 @@ executable hack-derive
11001106

11011107
-- Haskell indexer via hie
11021108
executable hie-indexer
1103-
import: deps, fb-haskell, exe
1104-
if impl(ghc >= 8.8)
1105-
buildable: True
1106-
else
1107-
buildable: False
1109+
import: deps, fb-haskell, exe, haskell-indexer
11081110
hs-source-dirs: glean/lang/haskell
11091111
main-is: HieIndexer/Main.hs
11101112
other-modules:
@@ -2143,7 +2145,7 @@ test-suite glean-snapshot-hack
21432145
buildable: False
21442146

21452147
test-suite glean-snapshot-haskell
2146-
import: fb-haskell, fb-cpp, deps, exe
2148+
import: fb-haskell, fb-cpp, deps, exe, haskell-indexer
21472149
hs-source-dirs: glean/lang/haskell/tests
21482150
type: exitcode-stdio-1.0
21492151
main-is: Main.hs
@@ -2156,7 +2158,7 @@ test-suite glean-snapshot-haskell
21562158
glean:glean
21572159

21582160
test-suite glean-snapshot-codemarkup-haskell
2159-
import: fb-haskell, fb-cpp, deps, exe
2161+
import: fb-haskell, fb-cpp, deps, exe, haskell-indexer
21602162
hs-source-dirs: glean/lang/codemarkup/tests/haskell
21612163
type: exitcode-stdio-1.0
21622164
main-is: Main.hs
@@ -2358,7 +2360,7 @@ test-suite glass-regression-hack
23582360
buildable: False
23592361

23602362
test-suite glass-regression-haskell
2361-
import: glass-regression-deps, fb-haskell, deps, exe
2363+
import: glass-regression-deps, fb-haskell, deps, exe, haskell-indexer
23622364
type: exitcode-stdio-1.0
23632365
main-is: Glean/Glass/Regression/Haskell/Main.hs
23642366
ghc-options: -main-is Glean.Glass.Regression.Haskell.Main

0 commit comments

Comments
 (0)