unintegrate the rest of the train on failed pushes#174
Merged
OpsBotPrime merged 1 commit intomasterfrom Aug 24, 2022
Merged
Conversation
When a promotion (push to master) fails, we should not only reintegrate the head PR, but also unintegrate the rest of the train.
rudymatela
added
bug
Author
|
@RileyApeldoorn Thanks for the review. @OpsBotPrime merge! |
|
Pull request approved for merge by @rudymatela, rebasing now. |
|
Rebased as 95a4ac9, waiting for CI … |
|
CI job 🟡 started. |
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
3 participants
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.
Closes: #170
When a promotion (push to master) fails, we should not only reintegrate the head PR, but also unintegrate the rest of the train so that it is reintegrated on top of the new head PR.
Adding automated tests to this will not be easy, so I ended up testing manually. There is no way to simlulate integration failures from the free monad interface. See the 4 PRs that link here for a couple of local test runs:
⬆️ Here the speculative rebase was done immediately after we failed to promote the other PR due to its testing branch being stale.