Skip to content

Commit 2a7134d

Browse files
committed
Update workflows from templates.
1 parent 82c7d2f commit 2a7134d

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

.github/workflows/bump-version.yaml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,13 @@ jobs:
6363
\ client succeeds\n # pushing the tag, and another client succeeds pushing\
6464
\ the commit. Instead, we push the commit first and then the tag.\n # That\
6565
\ seems to cause the loser of the race to fail early.\n if git push origin\
66-
\ \"${{ github.ref }}\" && git push origin \"${release}\" ; then\n break\n\
67-
\ fi\n\n # If the \"git push\" failed, then let's forget our last two commits,\
68-
\ re-pull the latest changes, and try again.\n git reset --hard HEAD~2\n\
69-
\ git tag -d \"${release}\"\n git pull origin \"${{ github.ref }}\"\n #\
70-
\ Wait a little bit to let competing workflows finish their business.\n sleep\
71-
\ 10\ndone\n"
66+
\ \"${{ github.ref }}\" && git push origin \"${release}\" ; then\n # Just\
67+
\ exit.\n exit 0\n fi\n\n # If the \"git push\" failed, then let's forget\
68+
\ our last two commits, re-pull the latest changes, and try again.\n git\
69+
\ reset --hard HEAD~2\n git tag -d \"${release}\"\n git pull origin \"${{\
70+
\ github.ref }}\"\n # Wait a little bit to let competing workflows finish\
71+
\ their business.\n sleep 10\ndone\n# Fallthrough for repeated failure case.\n\
72+
echo \"Failed to push bumped versions; tried $TRY times.\"\nexit 1\n"
7273
- name: Generate release text
7374
id: release-body
7475
run: "set -x\n# Get the most recent commit. Hopefully it was a PR merge.\nCOMMIT=$(jq\

0 commit comments

Comments
 (0)