From c44eaf107faf7e44f8b663cea95f66583ea065af Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 14 May 2019 04:39:56 -0400 Subject: [PATCH] CI: When stopping the build early, log where it was left --- ci/RELEASE.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ci/RELEASE.sh b/ci/RELEASE.sh index a835ebcb3..dfb65cfeb 100644 --- a/ci/RELEASE.sh +++ b/ci/RELEASE.sh @@ -41,8 +41,8 @@ BUILDDIR=$(mktemp -d --suffix=-build --tmpdir=.) if test "x$BUILD_DEFAULT" = "xtrue" ; then rm -rf "$BUILDDIR" mkdir "$BUILDDIR" || { echo "Could not create build directory." ; exit 1 ; } - ( cd "$BUILDDIR" && cmake .. && make -j4 ) || { echo "Could not perform test-build." ; exit 1 ; } - ( cd "$BUILDDIR" && make test ) || { echo "Tests failed." ; exit 1 ; } + ( cd "$BUILDDIR" && cmake .. && make -j4 ) || { echo "Could not perform test-build in $BUILDDIR." ; exit 1 ; } + ( cd "$BUILDDIR" && make test ) || { echo "Tests failed in $BUILDDIR." ; exit 1 ; } fi ### Build with clang @@ -53,13 +53,13 @@ if test "x$BUILD_CLANG" = "xtrue" ; then # Do build again with clang rm -rf "$BUILDDIR" mkdir "$BUILDDIR" || { echo "Could not create build directory." ; exit 1 ; } - ( cd "$BUILDDIR" && CC=clang CXX=clang++ cmake .. && make -j4 ) || { echo "Could not perform test-build." ; exit 1 ; } - ( cd "$BUILDDIR" && make test ) || { echo "Tests failed." ; exit 1 ; } + ( cd "$BUILDDIR" && CC=clang CXX=clang++ cmake .. && make -j4 ) || { echo "Could not perform test-build in $BUILDDIR." ; exit 1 ; } + ( cd "$BUILDDIR" && make test ) || { echo "Tests failed in $BUILDDIR." ; exit 1 ; } fi fi if test "x$BUILD_ONLY" = "xtrue" ; then - echo "Builds completed, release stopped." + echo "Builds completed, release stopped. Build remains in $BUILDDIR." exit 1 fi