Skip to content

Commit aa51b49

Browse files
committed
Haskell CI: exclude haddock step for GHC < 8.6
1 parent a14889f commit aa51b49

File tree

2 files changed

+17
-6
lines changed

2 files changed

+17
-6
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,7 @@ jobs:
283283
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package hackage-security-HTTP" >> cabal.project ; fi
284284
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
285285
cat >> cabal.project <<EOF
286+
constraints: base-compat >= 0.12.2
286287
EOF
287288
if $HEADHACKAGE; then
288289
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
@@ -331,11 +332,11 @@ jobs:
331332
${CABAL} -vnormal check
332333
- name: haddock
333334
run: |
334-
$CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
335+
if [ $((HCNUMVER >= 80600)) -ne 0 ] ; then $CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all ; fi
335336
- name: unconstrained build
336337
run: |
337-
if [ $((HCNUMVER < 90600)) -ne 0 ] ; then rm -f cabal.project.local ; fi
338-
if [ $((HCNUMVER < 90600)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all ; fi
338+
rm -f cabal.project.local
339+
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
339340
- name: prepare for constraint sets
340341
run: |
341342
rm -f cabal.project.local

cabal.haskell-ci

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,19 @@ branches: master ci-*
22

33
ghc-head: True
44

5-
-- Andreas, 2023-02-20: see https://github.com/haskell/hackage-security/pull/291
6-
-- unconstrained build with head.hackage produces failing build plans
7-
unconstrained: < 9.6
5+
-- Andreas, 2023-07-01: We use some haddock features that are new in 8.6.
6+
haddock: >= 8.6
7+
8+
-- -- Andreas, 2023-02-20: see https://github.com/haskell/hackage-security/pull/291
9+
-- -- unconstrained build with head.hackage produces failing build plans
10+
-- unconstrained: < 9.6
11+
--
12+
-- Andreas, 2023-07-01
13+
-- Ryan GI Scott suggests this instead:
14+
-- see https://github.com/haskell-CI/haskell-ci/issues/643#issuecomment-1466195957
15+
raw-project
16+
constraints:
17+
base-compat >= 0.12.2
818

919
constraint-set no-lukko
1020
ghc: >=8.2

0 commit comments

Comments
 (0)