Skip to content

Commit

Permalink
Add mergify configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
okurz committed Jul 17, 2024
1 parent 22dfbf4 commit e9ce53c
Showing 1 changed file with 33 additions and 0 deletions.
33 changes: 33 additions & 0 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
pull_request_rules:
- name: automatic merge
conditions:
- and: &base_checks
- base=master
- -label~=^acceptance-tests-needed|not-ready
- status-success=integration
- status-success=unit
- and:
- "#approved-reviews-by>=1"
- "#changes-requested-reviews-by=0"
# https://doc.mergify.io/examples.html#require-all-requested-reviews-to-be-approved
- "#review-requested=0"
actions:
merge:
method: merge
- name: automatic merge on special label
conditions:
- and: *base_checks
- and:
# mergify config checks needs at least two rules in "and" so we repeat
# one from the base checks
- base=master
- label=merge-fast
actions:
merge:
method: merge
- name: ask to resolve conflict
conditions:
- conflict
actions:
comment:
message: This pull request is now in conflicts. Could you fix it? 🙏

0 comments on commit e9ce53c

Please sign in to comment.