fix(ci): pull rebase from main before commit and push in release workflow#6338
fix(ci): pull rebase from main before commit and push in release workflow#6338rubencarvalho wants to merge 2 commits into
Conversation
|
caseyisonit
left a comment
There was a problem hiding this comment.
wouldnt a rebase rewrite the history? would it be safer to use a merge?
@caseyisonit the CI workflow starts "fresh" every run, so there's no history to corrupt, i.e. rebase is safe. A merge would work too, but would leave one merge commit in the release log. |
📚 Branch Preview Links🔍 First Generation Visual Regression Test ResultsWhen a visual regression test fails (or has previously failed while working on this branch), its results can be found in the following URLs:
Deployed to Azure Blob Storage: If the changes are expected, update the |
Description
Add
git pull --rebase origin mainbefore staging and committing in the release workflow's "Commit and push changes" step.Motivation and context
If a PR is merged into main between the time the release workflow is triggered and the time the commit/push step runs, the push fails because the local branch is behind the remote. Pulling with rebase before staging ensures the release commit always lands on top of the latest main, avoiding the rejected push.
Related issue(s)
N/A
Screenshots (if appropriate)
N/A
Author's checklist
Reviewer's checklist
patch,minor, ormajorfeaturesManual review test cases
Device review
Accessibility testing checklist
No interactive UI changes in this PR; CI workflow change only.