diff options
author | Takenobu Tani <takenobu.hs@gmail.com> | 2019-04-14 21:31:05 +0900 |
---|---|---|
committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-06-02 22:54:43 -0400 |
commit | c4f94320a7048a7f263d8d952d4e12cc0227cf72 (patch) | |
tree | 9c08bc240158e5a3a38cfa4ec79ca79d15176e98 /.gitlab-ci.yml | |
parent | 43a39c3c2195d5b4400efc845a54f153184b1d7f (diff) | |
download | haskell-c4f94320a7048a7f263d8d952d4e12cc0227cf72.tar.gz |
Add `-haddock` to prepare-system.sh and .gitlab-ci.yml
To cover ci conditions from ghc8.6 to 8.9, I add `-haddock` option
to `.circleci/prepare-system.sh` and .gitlab-ci.yml.
after including `mk/flavours/*`.
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r-- | .gitlab-ci.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f9b2a42872..ab88747b69 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -608,6 +608,7 @@ nightly-i386-windows-hadrian: python boot bash -c './configure --enable-tarballs-autodownload GHC=`pwd`/toolchain/bin/ghc HAPPY=`pwd`/toolchain/bin/happy ALEX=`pwd`/toolchain/bin/alex $CONFIGURE_ARGS' - bash -c "echo include mk/flavours/${BUILD_FLAVOUR}.mk > mk/build.mk" + - bash -c "echo 'GhcLibHcOpts+=-haddock' >> mk/build.mk" - bash -c "PATH=`pwd`/toolchain/bin:$PATH make -j`mk/detect-cpu-count.sh`" - bash -c "PATH=`pwd`/toolchain/bin:$PATH make binary-dist TAR_COMP_OPTS=-1" - bash -c 'make V=0 test THREADS=`mk/detect-cpu-count.sh` JUNIT_FILE=../../junit.xml' |