summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Pickering <matthewtpickering@gmail.com>2022-05-23 09:14:39 +0100
committerMarge Bot <ben+marge-bot@smart-cactus.org>2022-05-30 09:41:39 -0400
commit59bd61599561b54c204f0b99c2f4f4abd1af5c57 (patch)
treea8ae7ccc489d563d886ade90c2050d4b2c3af425
parent5878f439d4214ba0dd895e56460f15fc6c67283c (diff)
downloadhaskell-59bd61599561b54c204f0b99c2f4f4abd1af5c57.tar.gz
ci: Make sure to exit promptly if `make install` fails.
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