search

channable / hoff

A gatekeeper for your commits
Apache License 2.0
41 stars 3 forks source link

unintegrate the rest of the train on failed pushes #174

Closed rudymatela closed 2 years ago

rudymatela commented 2 years ago

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:

church

:arrow_up: Here the speculative rebase was done immediately after we failed to promote the other PR due to its testing branch being stale.

haskell

rudymatela commented 2 years ago

@RileyApeldoorn Thanks for the review.

@OpsBotPrime merge!

OpsBotPrime commented 2 years ago

Pull request approved for merge by @rudymatela, rebasing now.

OpsBotPrime commented 2 years ago

Rebased as 95a4ac989b324ece10c0cb8d2fb651120e3f8b2f, waiting for CI …

OpsBotPrime commented 2 years ago

CI job :yellow_circle: started.