Retry release-bump push with --rebase on concurrent contention#277
Merged
Conversation
When multiple SE5 plugin workflows are dispatched at the same time (e.g. 'release them all') they all check out the same SHA, all create bump commits, and only one wins the push. The others got 'rejected (fetch first)' and failed the run. Wrap the push in a small retry loop: on rejection, git pull --rebase to fold the other plugin's bump under our own and try again. Up to 5 attempts, then fail loudly. Different plugins touch different plugin.json files so the rebase never conflicts; same-plugin double-dispatch is not a realistic case. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Follow-up to merged #275. When several SE5 plugin workflows are dispatched at the same time (as just happened during the 1.1.0 release run), they all check out the same SHA, all create their bump commits, and only one wins the push. The other 4 failed with
! [rejected] main -> main (fetch first)and had to be retriggered serially.This PR wraps the bump push in a small retry-with-rebase loop in all 5 prepare jobs:
Different plugins touch different
plugin.jsonfiles, so the rebase never conflicts. Same-plugin double-dispatch is not a realistic case (you wouldn't release the same plugin twice in parallel).Test plan
🤖 Generated with Claude Code