ci(root): block release when rel/latest is ahead of master#9153
Open
rashadjnizar wants to merge 1 commit into
Open
ci(root): block release when rel/latest is ahead of master#9153rashadjnizar wants to merge 1 commit into
rashadjnizar wants to merge 1 commit into
Conversation
Contributor
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.
HSM-436
Summary
Back merges from
rel/latestintomaster(e.g. #9127) are missed frequently. When that PR is skipped,rel/lateststays ahead ofmaster, and the next release merges/publishes on top of an out of syncrel/latest.This PR adds a
verify-back-mergegate tonpmjs-release.ymlthat fails the release ifrel/latestis not an ancestor ofmaster, forcing the previous back merge to land before a new release can run.What changed
verify-back-mergejob runsgit merge-base --is-ancestor origin/rel/latest origin/master. Exit 0 → release proceeds; otherwise it errors, prints the offending commits, and fails.release-bitgojsnow needs the gate and adds&& needs.verify-back-merge.result != 'failure'to itsif.Behavior
rel/latestintentionally ahead)