mirror of https://github.com/ceph/go-ceph
Add configuration for Mergify
These rules for Mergify do the following: 1. dismiss review +1's when a PR is updated but keep any -1 reviews, so the reviewer needs to confirm the update addresses the comment(s) 2. merge the PR when there are 2 (or more) positive reviews, and no negative ones don't merge when the 'do-not-merge' label is added to the PR also require that the status checks (CI) has passed 3. in case there are merge conflicts, Mergify will leave a message asking for a rebase Documentation: https://docs.mergify.io/configuration.html Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
parent
11b6c916ed
commit
7160ceaa3a
|
@ -0,0 +1,31 @@
|
||||||
|
---
|
||||||
|
pull_request_rules:
|
||||||
|
- name: remove outdated approvals
|
||||||
|
conditions:
|
||||||
|
- base=master
|
||||||
|
actions:
|
||||||
|
dismiss_reviews:
|
||||||
|
approved: true
|
||||||
|
changes_requested: false
|
||||||
|
- name: automatic merge
|
||||||
|
conditions:
|
||||||
|
- label!=do-not-merge
|
||||||
|
- base=master
|
||||||
|
- "#approved-reviews-by>=2"
|
||||||
|
- "#changes-requested-reviews-by=0"
|
||||||
|
- status-success=check
|
||||||
|
- status-success=test-suite
|
||||||
|
actions:
|
||||||
|
merge:
|
||||||
|
method: rebase
|
||||||
|
rebase_fallback: merge
|
||||||
|
dismiss_reviews: {}
|
||||||
|
delete_head_branch: {}
|
||||||
|
- name: ask to resolve conflict
|
||||||
|
conditions:
|
||||||
|
- conflict
|
||||||
|
actions:
|
||||||
|
comment:
|
||||||
|
message: "This pull request now has conflicts with the target branch.
|
||||||
|
Could you please resolve conflicts and force push the corrected
|
||||||
|
changes? 🙏"
|
Loading…
Reference in New Issue