summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2020-11-18 14:41:26 -0500
committerBen Gamari <ben@well-typed.com>2020-11-29 21:53:30 -0500
commit2d72607e7b6346ad3e0a7fe39e86ceb8f85e557b (patch)
tree4966d6defb676f2ea6f219417c7d650715b1da69
parent92c9bed7beabb6278d6bc3b228f3aa55e423e192 (diff)
downloadhaskell-wip/ghc-8.10-backports.tar.gz
gitlab-ci: Add VERBOSE environment variablewip/ghc-8.10-backports
And change the make build system's default behavior to V=0, greatly reducing build log sizes. (cherry picked from commit 802e9180dd9a9a88c4e8869f0de1048e1edd6343)
-rwxr-xr-x.gitlab/ci.sh6
1 files changed, 6 insertions, 0 deletions
diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh
index 13ec55f389..46b3e81129 100755
--- a/.gitlab/ci.sh
+++ b/.gitlab/ci.sh
@@ -348,6 +348,11 @@ function build_make() {
if [[ -z "$BIN_DIST_PREP_TAR_COMP" ]]; then
fail "BIN_DIST_PREP_TAR_COMP is not set"
fi
+ if [[ -n "$VERBOSE" ]]; then
+ MAKE_ARGS="$MAKE_ARGS V=1"
+ else
+ MAKE_ARGS="$MAKE_ARGS V=0"
+ fi
echo "include mk/flavours/${BUILD_FLAVOUR}.mk" > mk/build.mk
echo 'GhcLibHcOpts+=-haddock' >> mk/build.mk
@@ -402,6 +407,7 @@ function clean() {
}
function run_hadrian() {
+ if [ -n "$VERBOSE" ]; then HADRIAN_ARGS="$HADRIAN_ARGS -V"; fi
run hadrian/build.cabal.sh \
--flavour="$FLAVOUR" \
-j"$cores" \