ci: rebase before push in screenshots workflow#1942
Merged
Conversation
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## master #1942 +/- ##
=======================================
Coverage 98.10% 98.10%
=======================================
Files 61 61
Lines 2748 2748
=======================================
Hits 2696 2696
Misses 52 52 ☔ View full report in Codecov by Sentry. |
Add git pull --rebase before pushing updated CLI screenshots to avoid push rejections when master receives commits during the workflow run. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
b97902a to
6cb0ab3
Compare
Lee-W
approved these changes
May 3, 2026
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
Fixes the race condition in the
update-cli-screenshotsjob wheregit pushfails with a non-fast-forward rejection when another commit lands onmasterduring the workflow run.Added
git pull --rebase origin masterbeforegit pushso the screenshot commit is rebased on top of any new remote commits.Checklist
Was generative AI tooling used to co-author this PR?
Generated-by: GitHub Copilot following the guidelines
Code Changes
Expected Behavior
When another commit is pushed to
masterwhile the screenshots workflow is running, the workflow should rebase its screenshot commit on top and push successfully instead of failing.Steps to Test This Pull Request
Additional Context