diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2020-03-14 15:48:55 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2020-03-14 15:49:06 -0400 |
| commit | d0127b9239dae312ef9e835c0d0041b02a0f3869 (patch) | |
| tree | b4a19cf81daafdbf8d0ddfc252208fcc341b1f95 | |
| parent | dc5a1f3058c09443167094cd3727fc347b475785 (diff) | |
| download | haskell-wip/always-werror.tar.gz | |
gitlab-ci: Force -Werror in CIwip/always-werror
Previously we would leave this up to the build flavour but this can
allow warnings to sneak through.
| -rwxr-xr-x | .gitlab/ci.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh index ff612f663e..1c56994146 100755 --- a/.gitlab/ci.sh +++ b/.gitlab/ci.sh @@ -350,7 +350,8 @@ function build_make() { fi echo "include mk/flavours/${BUILD_FLAVOUR}.mk" > mk/build.mk - echo 'GhcLibHcOpts+=-haddock' >> mk/build.mk + echo 'GhcLibHcOpts += -haddock' >> mk/build.mk + echo 'WERROR += -Werror' >> mk/build.mk run "$MAKE" -j"$cores" $MAKE_ARGS run "$MAKE" -j"$cores" binary-dist-prep TAR_COMP_OPTS=-1 ls -lh "$BIN_DIST_PREP_TAR_COMP" @@ -378,6 +379,9 @@ function build_hadrian() { fail "FLAVOUR not set" fi + mkdir -p _build + echo "stage1.*.ghc.hs.opts += -Werror" > _build/hadrian.settings + run_hadrian binary-dist mv _build/bindist/ghc*.tar.xz ghc.tar.xz |