fix(ci): sync docker versions & add retry logic for concurrent bumps#786
Merged
fix(ci): sync docker versions & add retry logic for concurrent bumps#786
Conversation
Sync version files to match already-published docker tags: - lumier: 0.1.0 → 0.1.1 - qemu-android: 0.1.0 → 0.1.1 - xfce: 0.1.3 → 0.1.4 These versions were published successfully but the main branch update failed due to concurrent bump-version runs.
Contributor
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
When multiple bump-version workflows run concurrently, the first one to complete moves main forward, causing subsequent runs to fail with "Update is not a fast forward". This fix adds: - Retry loop with up to 5 attempts - Automatic rebase onto latest main when fast-forward fails - Reordered operations: update main BEFORE creating tag (prevents orphan tags) - Only create tag after main is successfully updated
f-trycua
changed the title
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
1 participant
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
Sync version files to match already-published docker tags:
Add retry logic with rebase for concurrent bump-version runs:
Context
When multiple bump-version workflows run concurrently, the first one to complete moves main forward, causing subsequent runs to fail with "Update is not a fast forward". The retry logic automatically rebases and retries.
The version sync is needed because those versions were successfully published (tags triggered CD) but main wasn't updated due to the concurrent fast-forward error.