summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Pickering <matthewtpickering@gmail.com>2022-05-23 09:14:39 +0100
committerMatthew Pickering <matthewtpickering@gmail.com>2022-05-23 09:14:39 +0100
commitdbe4d3dc2a8d0058738e758d4ba1cf0048c99170 (patch)
treefef82f9b6f283ca1ca1bdb800f712b45e02ef368
parentffbe28e56aa382164525300fbc32d78eefd95e7d (diff)
downloadhaskell-wip/fix-destdir-test.tar.gz
ci: Make sure to exit promptly if `make install` fails.wip/fix-destdir-test
Due to the vageries of bash, you have to explicitly handle the failure and exit when in a function. This failed to exit promptly when !8247 was failing. See #21358 for the general issue
-rwxr-xr-x.gitlab/ci.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh
index 3e3549e2f1..c64942a321 100755
--- a/.gitlab/ci.sh
+++ b/.gitlab/ci.sh
@@ -549,7 +549,7 @@ function make_install_destdir() {
mkdir -p "$destdir"
mkdir -p "$instdir"
- run "$MAKE" DESTDIR="$destdir" install
+ run "$MAKE" DESTDIR="$destdir" install || fail "make install failed"
# check for empty dir portably
# https://superuser.com/a/667100
if find "$instdir" -mindepth 1 -maxdepth 1 | read; then