DEVEX-780: fix race condition in php-common-bump workflow#103
Draft
pdodgen-revparts wants to merge 1 commit intomainfrom
Draft
DEVEX-780: fix race condition in php-common-bump workflow#103pdodgen-revparts wants to merge 1 commit intomainfrom
pdodgen-revparts wants to merge 1 commit intomainfrom
Conversation
The php-common-bump workflow was failing when main moved during execution. This adds fetch + rebase before pushing with retry logic to handle concurrent pushes to main.
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.
Description
Fix race condition in
php-common-bump.yamlthat causes workflow failures whenmainbranch moves during execution.Jira Issue: https://revolutionparts.atlassian.net/browse/DEVEX-780
Background
The
upgrade-commonworkflow in downstream repos (likebatch) was consistently failing with errors like:Root cause: The workflow does a simple
git push origin mainwhich fails if another commit lands onmainbetween checkout and push (typically ~1 minute window). This happens frequently when:Fix: Added fetch + rebase before pushing, with retry logic (up to 5 attempts) to handle concurrent pushes.
Testing Information
composer installandcomposer require