From d0127b9239dae312ef9e835c0d0041b02a0f3869 Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Sat, 14 Mar 2020 15:48:55 -0400
Subject: gitlab-ci: Force -Werror in CI

Previously we would leave this up to the build flavour but this can
allow warnings to sneak through.
---
 .gitlab/ci.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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
-- 
cgit v1.2.1