Upon PR closure, only reintegrate later pull requests if it is integrated#177
Upon PR closure, only reintegrate later pull requests if it is integrated#177OpsBotPrime merged 3 commits intomasterfrom
Conversation
... other PRs in the train
rudymatela
added
bug
Before an early PR closure (or new commit) had the power to unintegrate PRs in the train, regardless if this PR was integrated or not! The unintegration of later PRs should only happen when the PR being closed has been integrated and thus is the base for these following PRs.
| $ case Pr.lookupPullRequest pr state of | ||
| Just (Pr.PullRequest{Pr.integrationStatus = Promoted}) -> state | ||
| -- we unintegrate PRs after it if it has not been promoted to master | ||
| _ -> unintegrateAfter pr $ state |
There was a problem hiding this comment.
What would "after" even mean if a PR wasn't integrated?
There was a problem hiding this comment.
Hoff's internal terminology is a bit confusing:
- integrated mean: a
testing/123branch has been created with a rebase and merge commit - promoted means: the merge commit sha has been pushed to be the new master
So integrated after it means the further testing branches, e.g.:
testing/1is integrated on top ofmastertesting/2is integrated on top oftesting/1testing/3is integrated on top oftesting/2
What we want to do here with unintegrateAfter is, for example, supposing PR#2 is closed. To "unintegrate" testing/3 so it is scheduled to be integrated on top of testing/1 (assuming the build of PR#1 has not been concluded)
(But sometimes, sometimes, integrated is used to mean promoted. I should probably hunt these cases and make the terminology more consistent later.)
There was a problem hiding this comment.
What would "after" even mean if a PR wasn't integrated?
Yes, exactly! So we end up restarting the builds "randomly" because an unintegrated PR received a new push.
|
@OpsBotPrime merge |
|
Pull request approved for merge by @rudymatela, rebasing now. |
|
@fatho Thanks for the review! |
…it is integrated Approved-by: rudymatela Auto-deploy: false
|
Rebased as 772ab26, waiting for CI … |
|
CI job 🟡 started. |
3 participants
Closes: #161
Upon PR closure, only reintegrate later pull requests if it is integrated.
handlePullRequestClosedwas fixed. The build passes ✔️ on the second commit.Before an early PR closure (or new commit) had the power to unintegrate PRs in the train, regardless if this PR was integrated or not! The unintegration of later PRs should only happen when the PR being closed has been integrated and thus is the base for these following PRs.