search

channable / hoff

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

Retry integrating PRs on re-issuing merge commands #234

Closed crtschin closed 1 year ago

crtschin commented 1 year ago

Closes https://github.com/channable/hoff/issues/233.

Previously, re-issuing merge commands, only moved the approval index of a PR, essentially moving it up further into the queue. While the actual queue, and thus the git history stayed the same. Anything in the queue whose builds succeeded would then be merged, which contains the changes of the PR that moved back.

This fixes that by checking the integration status of a PR before handling the merge command. If the PR is found to be in progress, we do the same thing as a retry and simply redo everything.

crtschin commented 1 year ago

@OpsBotPrime merge

OpsBotPrime commented 1 year ago

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

OpsBotPrime commented 1 year ago

Rebased as 457892d13ad828b985699bb9d0ead723897b7a5f, waiting for CI …

OpsBotPrime commented 1 year ago

CI job :yellow_circle: started.