search

channable / hoff

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

Add a command to retry merging approved PRs with failed tests #222

Closed robbert-vdh closed 1 year ago

robbert-vdh commented 1 year ago

This adds a new retry[ on friday] command that allows approved PRs with failed checks to resubmitted as integration candidates, adding them to the end of the merge train. This is functionally equivalent to the current workaround of closing the PR, reopening it, and the then issuing t he approval command again.

An upside to having this be a separate command rather than an extra behavior for the merge command is that you can't accidentally change the approval type (e.g. from merge and deploy to plain merge) and it's a very explicit action you need to take. The error messages have also been updated to suggest the retry command instead of closing and reopening the PR and issuing a new merge command.

Pr.approval now also stores who retried the PR if it has been retried. This keeps the original approver in tact and the retrier is also shown on the dashboard.

This resolves #214.

robbert-vdh commented 1 year ago

Thanks for the review! I'll try to deploy this together with the parser change in an hour or so.

@OpsBotPrime merge

OpsBotPrime commented 1 year ago

Pull request approved for merge by @robbert-vdh, rebasing now.

OpsBotPrime commented 1 year ago

Rebased as 99d96c2107335386dc763dcc4ba2bceca276d3eb, waiting for CI …

OpsBotPrime commented 1 year ago

CI job :yellow_circle: started.