Skip to content

Commit 2922aa5

Browse files
andreasabelphadej
andreasabel
authored and
phadej
committed
Run haddock on all targets
- Remove `hasLibrary` guard from haddock step - Add argument `--haddock-all` to `cabal v2-haddock` calls
1 parent a66d8a5 commit 2922aa5

35 files changed

+46
-46
lines changed

‎.github/workflows/haskell-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ jobs:
297297
${CABAL} -vnormal check
298298
- name: haddock
299299
run: |
300-
$CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
300+
$CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
301301
- name: unconstrained build
302302
run: |
303303
rm -f cabal.project.local
@@ -309,4 +309,4 @@ jobs:
309309
run: |
310310
if [ $((HCNUMVER < 80400)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='deepseq ==1.4.*' --constraint='binary installed' --dependencies-only -j2 all ; fi
311311
if [ $((HCNUMVER < 80400)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='deepseq ==1.4.*' --constraint='binary installed' all ; fi
312-
if [ $((HCNUMVER < 80400)) -ne 0 ] ; then $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK --disable-tests --disable-benchmarks --constraint='deepseq ==1.4.*' --constraint='binary installed' all ; fi
312+
if [ $((HCNUMVER < 80400)) -ne 0 ] ; then $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK --disable-tests --disable-benchmarks --constraint='deepseq ==1.4.*' --constraint='binary installed' all ; fi

‎fixtures/all-versions.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,7 @@ change_dir "$BUILDDIR"
508508

509509
# haddock
510510
put_info "haddock"
511-
run_cmd_if $((! GHCJSARITH)) $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
511+
run_cmd_if $((! GHCJSARITH)) $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
512512

513513
# unconstrained build
514514
put_info "unconstrained build"

‎fixtures/all-versions.github

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ jobs:
443443
${CABAL} -vnormal check
444444
- name: haddock
445445
run: |
446-
if [ $((! GHCJSARITH)) -ne 0 ] ; then $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all ; fi
446+
if [ $((! GHCJSARITH)) -ne 0 ] ; then $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all ; fi
447447
- name: unconstrained build
448448
run: |
449449
rm -f cabal.project.local

‎fixtures/all-versions.travis

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ script:
277277
# cabal check...
278278
- (cd ${PKGDIR_splitmix} && ${CABAL} -vnormal check)
279279
# haddock...
280-
- if [ $((! GHCJSARITH)) -ne 0 ] ; then ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all ; fi
280+
- if [ $((! GHCJSARITH)) -ne 0 ] ; then ${CABAL} v2-haddock --haddock-all $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all ; fi
281281
# Building without installed constraints for packages in global-db...
282282
- rm -f cabal.project.local
283283
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all

‎fixtures/copy-fields-all.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ change_dir "$BUILDDIR"
540540

541541
# haddock
542542
put_info "haddock"
543-
run_cmd $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
543+
run_cmd $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
544544

545545
# unconstrained build
546546
put_info "unconstrained build"

‎fixtures/copy-fields-all.github

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ jobs:
380380
${CABAL} -vnormal check
381381
- name: haddock
382382
run: |
383-
$CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
383+
$CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
384384
- name: unconstrained build
385385
run: |
386386
rm -f cabal.project.local

‎fixtures/copy-fields-all.travis

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ script:
267267
- (cd ${PKGDIR_servant_docs} && ${CABAL} -vnormal check)
268268
- (cd ${PKGDIR_servant_server} && ${CABAL} -vnormal check)
269269
# haddock...
270-
- ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all
270+
- ${CABAL} v2-haddock --haddock-all $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all
271271
# Building without installed constraints for packages in global-db...
272272
- rm -f cabal.project.local
273273
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all

‎fixtures/copy-fields-none.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,7 @@ change_dir "$BUILDDIR"
529529

530530
# haddock
531531
put_info "haddock"
532-
run_cmd $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
532+
run_cmd $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
533533

534534
# unconstrained build
535535
put_info "unconstrained build"

‎fixtures/copy-fields-none.github

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ jobs:
369369
${CABAL} -vnormal check
370370
- name: haddock
371371
run: |
372-
$CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
372+
$CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
373373
- name: unconstrained build
374374
run: |
375375
rm -f cabal.project.local

‎fixtures/copy-fields-none.travis

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ script:
245245
- (cd ${PKGDIR_servant_docs} && ${CABAL} -vnormal check)
246246
- (cd ${PKGDIR_servant_server} && ${CABAL} -vnormal check)
247247
# haddock...
248-
- ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all
248+
- ${CABAL} v2-haddock --haddock-all $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all
249249
# Building without installed constraints for packages in global-db...
250250
- rm -f cabal.project.local
251251
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all

‎fixtures/copy-fields-some.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,7 @@ change_dir "$BUILDDIR"
532532

533533
# haddock
534534
put_info "haddock"
535-
run_cmd $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
535+
run_cmd $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
536536

537537
# unconstrained build
538538
put_info "unconstrained build"

‎fixtures/copy-fields-some.github

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ jobs:
372372
${CABAL} -vnormal check
373373
- name: haddock
374374
run: |
375-
$CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
375+
$CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
376376
- name: unconstrained build
377377
run: |
378378
rm -f cabal.project.local

‎fixtures/copy-fields-some.travis

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ script:
251251
- (cd ${PKGDIR_servant_docs} && ${CABAL} -vnormal check)
252252
- (cd ${PKGDIR_servant_server} && ${CABAL} -vnormal check)
253253
# haddock...
254-
- ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all
254+
- ${CABAL} v2-haddock --haddock-all $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all
255255
# Building without installed constraints for packages in global-db...
256256
- rm -f cabal.project.local
257257
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all

‎fixtures/empty-line.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,7 @@ change_dir "$BUILDDIR"
532532

533533
# haddock
534534
put_info "haddock"
535-
run_cmd $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
535+
run_cmd $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
536536

537537
# unconstrained build
538538
put_info "unconstrained build"

‎fixtures/empty-line.github

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ jobs:
386386
${CABAL} -vnormal check
387387
- name: haddock
388388
run: |
389-
$CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
389+
$CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
390390
- name: unconstrained build
391391
run: |
392392
rm -f cabal.project.local

‎fixtures/empty-line.travis

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ script:
275275
- (cd ${PKGDIR_servant_docs} && ${CABAL} -vnormal check)
276276
- (cd ${PKGDIR_servant_server} && ${CABAL} -vnormal check)
277277
# haddock...
278-
- ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all
278+
- ${CABAL} v2-haddock --haddock-all $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all
279279
# Building without installed constraints for packages in global-db...
280280
- rm -f cabal.project.local
281281
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all

‎fixtures/enabled-jobs.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,7 @@ change_dir "$BUILDDIR"
508508

509509
# haddock
510510
put_info "haddock"
511-
run_cmd_if $((! GHCJSARITH)) $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
511+
run_cmd_if $((! GHCJSARITH)) $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
512512

513513
# unconstrained build
514514
put_info "unconstrained build"

‎fixtures/enabled-jobs.github

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ jobs:
353353
${CABAL} -vnormal check
354354
- name: haddock
355355
run: |
356-
if [ $((! GHCJSARITH)) -ne 0 ] ; then $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all ; fi
356+
if [ $((! GHCJSARITH)) -ne 0 ] ; then $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all ; fi
357357
- name: unconstrained build
358358
run: |
359359
rm -f cabal.project.local

‎fixtures/enabled-jobs.travis

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ script:
223223
# cabal check...
224224
- (cd ${PKGDIR_splitmix} && ${CABAL} -vnormal check)
225225
# haddock...
226-
- if [ $((! GHCJSARITH)) -ne 0 ] ; then ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all ; fi
226+
- if [ $((! GHCJSARITH)) -ne 0 ] ; then ${CABAL} v2-haddock --haddock-all $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all ; fi
227227
# Building without installed constraints for packages in global-db...
228228
- rm -f cabal.project.local
229229
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all

‎fixtures/irc-channels.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,7 @@ change_dir "$BUILDDIR"
508508

509509
# haddock
510510
put_info "haddock"
511-
run_cmd $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
511+
run_cmd $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
512512

513513
# unconstrained build
514514
put_info "unconstrained build"

‎fixtures/irc-channels.github

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ jobs:
372372
${CABAL} -vnormal check
373373
- name: haddock
374374
run: |
375-
$CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
375+
$CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
376376
- name: unconstrained build
377377
run: |
378378
rm -f cabal.project.local

‎fixtures/irc-channels.travis

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ script:
225225
# cabal check...
226226
- (cd ${PKGDIR_servant} && ${CABAL} -vnormal check)
227227
# haddock...
228-
- ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all
228+
- ${CABAL} v2-haddock --haddock-all $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all
229229
# Building without installed constraints for packages in global-db...
230230
- rm -f cabal.project.local
231231
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all

‎fixtures/messy.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ change_dir "$BUILDDIR"
533533

534534
# haddock
535535
put_info "haddock"
536-
run_cmd $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
536+
run_cmd $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
537537

538538
# unconstrained build
539539
put_info "unconstrained build"

‎fixtures/messy.github

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ jobs:
387387
${CABAL} -vnormal check
388388
- name: haddock
389389
run: |
390-
$CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
390+
$CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
391391
- name: unconstrained build
392392
run: |
393393
rm -f cabal.project.local

‎fixtures/messy.travis

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ script:
269269
- (cd ${PKGDIR_servant_docs} && ${CABAL} -vnormal check)
270270
- (cd ${PKGDIR_servant_server} && ${CABAL} -vnormal check)
271271
# haddock...
272-
- ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all
272+
- ${CABAL} v2-haddock --haddock-all $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all
273273
# Building without installed constraints for packages in global-db...
274274
- rm -f cabal.project.local
275275
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all

‎fixtures/psql.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,7 @@ change_dir "$BUILDDIR"
508508

509509
# haddock
510510
put_info "haddock"
511-
run_cmd $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
511+
run_cmd $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
512512

513513
# unconstrained build
514514
put_info "unconstrained build"

‎fixtures/psql.github

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ jobs:
351351
${CABAL} -vnormal check
352352
- name: haddock
353353
run: |
354-
$CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
354+
$CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
355355
- name: unconstrained build
356356
run: |
357357
rm -f cabal.project.local

‎fixtures/psql.travis

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ script:
222222
# cabal check...
223223
- (cd ${PKGDIR_servant} && ${CABAL} -vnormal check)
224224
# haddock...
225-
- ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all
225+
- ${CABAL} v2-haddock --haddock-all $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all
226226
# Building without installed constraints for packages in global-db...
227227
- rm -f cabal.project.local
228228
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all

‎fixtures/travis-patch.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,7 @@ change_dir "$BUILDDIR"
508508

509509
# haddock
510510
put_info "haddock"
511-
run_cmd $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
511+
run_cmd $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
512512

513513
# unconstrained build
514514
put_info "unconstrained build"

‎fixtures/travis-patch.github

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ jobs:
345345
${CABAL} -vnormal check
346346
- name: haddock
347347
run: |
348-
$CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
348+
$CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
349349
- name: unconstrained build
350350
run: |
351351
rm -f cabal.project.local

‎fixtures/travis-patch.travis

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ script:
218218
# cabal check...
219219
- (cd ${PKGDIR_servant} && ${CABAL} -vnormal check)
220220
# haddock...
221-
- ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all
221+
- ${CABAL} v2-haddock --haddock-all $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all
222222
# Building without installed constraints for packages in global-db...
223223
- rm -f cabal.project.local
224224
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all

‎haskell-ci.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ change_dir "$BUILDDIR"
537537

538538
# haddock
539539
put_info "haddock"
540-
run_cmd $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
540+
run_cmd $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
541541

542542
# unconstrained build
543543
put_info "unconstrained build"
@@ -550,7 +550,7 @@ run_cmd rm -f cabal.project.local
550550
put_info "constraint set deepseq-1.4"
551551
run_cmd_if $((HCNUMVER < 80400)) $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='deepseq ==1.4.*' --constraint='binary installed' --dependencies-only -j all
552552
run_cmd_if $((HCNUMVER < 80400)) $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='deepseq ==1.4.*' --constraint='binary installed' all
553-
run_cmd_if $((HCNUMVER < 80400)) $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK --disable-tests --disable-benchmarks --constraint='deepseq ==1.4.*' --constraint='binary installed' all
553+
run_cmd_if $((HCNUMVER < 80400)) $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK --disable-tests --disable-benchmarks --constraint='deepseq ==1.4.*' --constraint='binary installed' all
554554

555555

556556
# Done

‎src/HaskellCI/Bash.hs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -198,9 +198,9 @@ makeBash _argv config@Config {..} prj jobs@JobVersions {..} = do
198198
change_dir "$BUILDDIR"
199199

200200
-- haddock
201-
when (hasLibrary && not (equivVersionRanges C.noVersion cfgHaddock)) $ step "haddock" $ do
201+
when (not (equivVersionRanges C.noVersion cfgHaddock)) $ step "haddock" $ do
202202
let range = RangeGHC /\ Range cfgHaddock
203-
run_cmd_if range "$CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all"
203+
run_cmd_if range "$CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all"
204204

205205
-- unconstrained build
206206
unless (equivVersionRanges C.noVersion cfgUnconstrainted) $ step "unconstrained build" $ do
@@ -226,8 +226,8 @@ makeBash _argv config@Config {..} prj jobs@JobVersions {..} = do
226226
run_cmd_cs $ "$CABAL v2-build $ARG_COMPILER " ++ allFlags ++ " all"
227227
when (csRunTests cs) $
228228
run_cmd_cs' hasTests $ "$CABAL v2-test $ARG_COMPILER " ++ allFlags ++ " all"
229-
when (hasLibrary && csHaddock cs) $
230-
run_cmd_cs $ "$CABAL v2-haddock $ARG_COMPILER " ++ withHaddock ++ " " ++ allFlags ++ " all"
229+
when (csHaddock cs) $
230+
run_cmd_cs $ "$CABAL v2-haddock --haddock-all $ARG_COMPILER " ++ withHaddock ++ " " ++ allFlags ++ " all"
231231

232232
return defaultZ
233233
{ zJobs =

‎src/HaskellCI/GitHub.hs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -558,9 +558,9 @@ makeGitHub _argv config@Config {..} gitconfig prj jobs@JobVersions {..} = do
558558
sh_if range "${CABAL} -vnormal check"
559559

560560
-- haddock
561-
when (hasLibrary && not (equivVersionRanges C.noVersion cfgHaddock)) $ githubRun "haddock" $ do
561+
when (not (equivVersionRanges C.noVersion cfgHaddock)) $ githubRun "haddock" $ do
562562
let range = RangeGHC /\ Range cfgHaddock
563-
sh_if range "$CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all"
563+
sh_if range "$CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all"
564564

565565
-- unconstrained build
566566
unless (equivVersionRanges C.noVersion cfgUnconstrainted) $ githubRun "unconstrained build" $ do
@@ -590,8 +590,8 @@ makeGitHub _argv config@Config {..} gitconfig prj jobs@JobVersions {..} = do
590590
sh_cs' docspecRange cabalDocspec
591591
when (csRunTests cs) $
592592
sh_cs' hasTests $ "$CABAL v2-test $ARG_COMPILER " ++ allFlags ++ " all"
593-
when (hasLibrary && csHaddock cs) $
594-
sh_cs $ "$CABAL v2-haddock $ARG_COMPILER " ++ withHaddock ++ " " ++ allFlags ++ " all"
593+
when (csHaddock cs) $
594+
sh_cs $ "$CABAL v2-haddock --haddock-all $ARG_COMPILER " ++ withHaddock ++ " " ++ allFlags ++ " all"
595595

596596
-- assembling everything
597597
return GitHub

‎src/HaskellCI/Travis.hs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -375,9 +375,9 @@ makeTravis argv config@Config {..} prj jobs@JobVersions {..} = do
375375
"(cd " ++ pkgNameDirVariable pkgName ++ " && ${CABAL} -vnormal check)"
376376

377377
-- haddock
378-
when (hasLibrary && not (equivVersionRanges C.noVersion cfgHaddock)) $
378+
when (not (equivVersionRanges C.noVersion cfgHaddock)) $
379379
foldedSh FoldHaddock "haddock..." cfgFolds $
380-
shForJob (RangeGHC /\ Range cfgHaddock) $ cabal $ "v2-haddock $WITHCOMPILER " ++ withHaddock ++ " ${TEST} ${BENCH} all"
380+
shForJob (RangeGHC /\ Range cfgHaddock) $ cabal $ "v2-haddock --haddock-all $WITHCOMPILER " ++ withHaddock ++ " ${TEST} ${BENCH} all"
381381

382382
-- unconstained build
383383
-- Have to build last, as we remove cabal.project.local
@@ -406,8 +406,8 @@ makeTravis argv config@Config {..} prj jobs@JobVersions {..} = do
406406
shForCs $ cabal $ "v2-build $WITHCOMPILER " ++ allFlags ++ " all"
407407
when (csRunTests cs) $
408408
shForCs' hasTests $ cabal $ "v2-test $WITHCOMPILER " ++ allFlags ++ " all --test-show-details=direct"
409-
when (hasLibrary && csHaddock cs) $
410-
shForCs $ cabal $ "v2-haddock $WITHCOMPILER " ++ withHaddock ++ " " ++ allFlags ++ " all"
409+
when (csHaddock cs) $
410+
shForCs $ cabal $ "v2-haddock --haddock-all $WITHCOMPILER " ++ withHaddock ++ " " ++ allFlags ++ " all"
411411

412412
-- At the end, we allow some raw travis scripts
413413
unless (null cfgRawTravis) $ do

0 commit comments

Comments
 (0)