Skip to content

fix(ci): pull rebase from main before commit and push in release workflow#6338

Open
rubencarvalho wants to merge 2 commits into
mainfrom
rcarvalho/fix-release-rebase-before-push
Open

fix(ci): pull rebase from main before commit and push in release workflow#6338
rubencarvalho wants to merge 2 commits into
mainfrom
rcarvalho/fix-release-rebase-before-push

Conversation

@rubencarvalho
Copy link
Copy Markdown
Contributor

Description

Add git pull --rebase origin main before 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

  • I have read the CONTRIBUTING and PULL_REQUESTS documents.
  • I have reviewed at the Accessibility Practices for this feature, see: Aria Practices
  • I have added automated tests to cover my changes.
  • I have included a well-written changeset if my change needs to be published.
  • I have included updated documentation if my change required it.

Reviewer's checklist

  • Includes a Github Issue with appropriate flag or Jira ticket number without a link
  • Includes thoughtfully written changeset if changes suggested include patch, minor, or major features
  • Automated tests cover all use cases and follow best practices for writing
  • Validated on all supported browsers
  • All VRTs are approved before the author can update Golden Hash

Manual review test cases

  • Trigger the release workflow while a PR is simultaneously merged to main; verify the workflow completes without a rejected push error.

Device review

  • Did it pass in Desktop?
  • Did it pass in (emulated) Mobile?
  • Did it pass in (emulated) iPad?

Accessibility testing checklist

No interactive UI changes in this PR; CI workflow change only.

  • Keyboard — not applicable (no UI changes)
  • Screen reader — not applicable (no UI changes)

@rubencarvalho rubencarvalho requested a review from a team as a code owner May 26, 2026 11:32
@changeset-bot
Copy link
Copy Markdown

changeset-bot Bot commented May 26, 2026

⚠️ No Changeset found

Latest commit: 5eebc73

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@rubencarvalho rubencarvalho added the Status:Ready for review PR ready for review or re-review. label May 26, 2026
Copy link
Copy Markdown
Contributor

@caseyisonit caseyisonit left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wouldnt a rebase rewrite the history? would it be safer to use a merge?

@rubencarvalho
Copy link
Copy Markdown
Contributor Author

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.

@rubencarvalho rubencarvalho requested a review from caseyisonit May 29, 2026 09:34
@caseyisonit caseyisonit added Status:Ready for merge PR has 2 approvals, all tests pass, and is ready to merge and removed Status:Ready for review PR ready for review or re-review. labels May 29, 2026
@github-actions
Copy link
Copy Markdown
Contributor

📚 Branch Preview Links

🔍 First Generation Visual Regression Test Results

When 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: pr-6338

If the changes are expected, update the current_golden_images_cache hash in the circleci config to accept the new images. Instructions are included in that file.
If the changes are unexpected, you can investigate the cause of the differences and update the code accordingly.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Status:Ready for merge PR has 2 approvals, all tests pass, and is ready to merge

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants