From 0ce1843070e6ca39126a69f93e1414d0f4342be2 Mon Sep 17 00:00:00 2001 From: Robin Munn Date: Mon, 26 Oct 2020 23:58:21 +0700 Subject: [PATCH] Simplify ci-push.sh: end script on any error (#4886) Use the bash -e option to exit on any error, so || exit 1 is not needed. As a bonus, this lets us get the actual return code from any failures. --- bin/ci-push.sh | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/bin/ci-push.sh b/bin/ci-push.sh index 670d2acdf..dff297c80 100755 --- a/bin/ci-push.sh +++ b/bin/ci-push.sh @@ -2,19 +2,14 @@ # Push output back to GitHub +# Exit script immediately if any command fails +set -e -cd output || exit 1 - -git config --global user.email "actions@github.com" || exit 1 - -git config --global user.name "GitHub Actions" || exit 1 - -git add -A . || exit 1 - -git commit --message "GitHub build: $GITHUB_RUN_NUMBER of $TW5_BUILD_BRANCH ($(date +'%F %T %Z'))" || exit 1 - -git remote add deploy "https://$GH_TOKEN@github.com/Jermolene/jermolene.github.io.git" &>/dev/null || exit 1 - -git push deploy master &>/dev/null || exit 1 - -cd .. || exit 1 +cd output +git config --global user.email "actions@github.com" +git config --global user.name "GitHub Actions" +git add -A . +git commit --message "GitHub build: $GITHUB_RUN_NUMBER of $TW5_BUILD_BRANCH ($(date +'%F %T %Z'))" +git remote add deploy "https://$GH_TOKEN@github.com/Jermolene/jermolene.github.io.git" &>/dev/null +git push deploy master &>/dev/null +cd ..