fix(ci): rebase onto main before pushing update commits - #1
Merged
Conversation
Stale origin/main after checkout caused non-fast-forward push failures when commits landed on main during the update job. Fetch/rebase first, then export rev so downstream jobs use the SHA that lands on 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
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
updatejob whenmainadvances after checkout (seen on Dockershelf/node26 run 28933191331).origin/main, rebase local update commits when behind, then push.revafter push so build/smoke/publish check out the SHA that actually landed onmain.Test plan
mainpipeline / update→ Push update commits succeeds when remotemainhas newer commits than the job checkout