status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

remove set -e for cherry-pick script since we collect errors (#8177)

This commit is contained in:
Alvin Huang 2020-06-23 18:37:20 -04:00 committed by GitHub
parent c63c994b04
commit 2a95289f56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.circleci/scripts/cherry-picker.sh
View File

@ -7,7 +7,7 @@
# Requires $CIRCLE_PROJECT_USERNAME, $CIRCLE_PROJECT_REPONAME, and $CIRCLE_SHA1 from CircleCI # Requires $CIRCLE_PROJECT_USERNAME, $CIRCLE_PROJECT_REPONAME, and $CIRCLE_SHA1 from CircleCI
set -e -o pipefail set -o pipefail
# colorized status prompt # colorized status prompt
function status { function status {
@ -135,17 +135,17 @@ for label in $labels; do
status "backporting to stable-website" status "backporting to stable-website"
branch="stable-website" branch="stable-website"
cherry_pick_with_slack_notification "$branch" "$CIRCLE_SHA1" "$pr_url" cherry_pick_with_slack_notification "$branch" "$CIRCLE_SHA1" "$pr_url"
(( backport_failures += "$?" )) backport_failures=$((backport_failures + "$?"))
# else if the label matches backport/*, it will attempt to cherry-pick to the release branch # else if the label matches backport/*, it will attempt to cherry-pick to the release branch
elif [[ $label =~ backport/* ]]; then elif [[ $label =~ backport/* ]]; then
status "backporting to $label" status "backporting to $label"
branch="${label/backport/release}.x" branch="${label/backport/release}.x"
cherry_pick_with_slack_notification "$branch" "$CIRCLE_SHA1" "$pr_url" cherry_pick_with_slack_notification "$branch" "$CIRCLE_SHA1" "$pr_url"
(( backport_failures += "$?" )) backport_failures=$((backport_failures + "$?"))
fi fi
done done
if [ "$backport_failures" -ne 0 ]; then if [ "$backport_failures" -ne 0 ]; then
echo "$backport_failures backports failed" echo "$backport_failures backports failed"
exit $backport_failures exit 1
fi fi