From bf21e8a4f54464cb114eb247e2dfa0608a132d4e Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 21 Nov 2019 14:07:41 +0100 Subject: [PATCH] CI: clean up after tx checking --- ci/txcheck.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/ci/txcheck.sh b/ci/txcheck.sh index 39b4fdcb0..f94f035fd 100644 --- a/ci/txcheck.sh +++ b/ci/txcheck.sh @@ -42,11 +42,9 @@ tx_sum() HEAD_SUM=`tx_sum build-txcheck-head ""` PREV_SUM=`tx_sum build-txcheck-prev translation` -test -d build-txcheck-head || exit 1 -test -d build-txcheck-prev || exit 1 - -echo "HEAD=$HEAD_SUM" -echo "PREV=$PREV_SUM" +# An error message will have come from the shell function +test -d build-txcheck-head || { echo "$HEAD_SUM" ; exit 1 ; } +test -d build-txcheck-prev || { echo "$PREV_SUM" ; exit 1 ; } if test "$HEAD_SUM" = "$PREV_SUM" ; then : @@ -59,4 +57,9 @@ else exit 1 fi +# Cleanup artifacs of checking +git worktree remove --force build-txcheck-head +git worktree remove --force build-txcheck-prev +git branch -D build-txcheck-head + exit 0