2020-10-26 09:31:42 +00:00
|
|
|
---
|
2022-01-24 18:38:31 +00:00
|
|
|
# each test should be listed separately, do not use regular expressions:
|
|
|
|
# https://docs.mergify.io/conditions.html#validating-all-status-check
|
|
|
|
# Until mergify allows us to have default conditions, we will need to
|
|
|
|
# repeat this list in a few places.
|
|
|
|
queue_rules:
|
|
|
|
- name: default
|
|
|
|
conditions:
|
|
|
|
- check-success=check
|
|
|
|
- check-success=dpulls
|
|
|
|
- check-success=test-suite (octopus)
|
|
|
|
- check-success=test-suite (pacific)
|
2023-08-07 17:15:58 +00:00
|
|
|
- check-success=test-suite (quincy)
|
2023-08-02 15:31:10 +00:00
|
|
|
- check-success=test-suite (reef)
|
2024-08-20 10:23:16 +00:00
|
|
|
merge_method: rebase
|
|
|
|
update_method: rebase
|
2022-01-24 18:38:31 +00:00
|
|
|
|
2020-10-26 09:31:42 +00:00
|
|
|
pull_request_rules:
|
2022-01-24 18:38:31 +00:00
|
|
|
# Clearing approvals after content changes
|
2020-10-26 09:31:42 +00:00
|
|
|
- name: remove outdated approvals
|
|
|
|
conditions:
|
|
|
|
- base=master
|
|
|
|
actions:
|
|
|
|
dismiss_reviews:
|
|
|
|
approved: true
|
|
|
|
changes_requested: false
|
2022-01-24 18:38:31 +00:00
|
|
|
# Our auto merge rules
|
2020-10-26 09:31:42 +00:00
|
|
|
- name: automatic merge
|
|
|
|
conditions:
|
|
|
|
- label!=do-not-merge
|
2020-12-17 18:12:22 +00:00
|
|
|
- label!=extended-review
|
2020-10-26 09:31:42 +00:00
|
|
|
- base=master
|
|
|
|
- "#changes-requested-reviews-by=0"
|
|
|
|
- status-success=check
|
2021-05-17 14:34:58 +00:00
|
|
|
- status-success=dpulls
|
2022-01-24 18:38:31 +00:00
|
|
|
# See above
|
2020-11-03 14:09:03 +00:00
|
|
|
- status-success=test-suite (octopus)
|
2021-05-17 14:34:58 +00:00
|
|
|
- status-success=test-suite (pacific)
|
2023-08-07 17:15:58 +00:00
|
|
|
- status-success=test-suite (quincy)
|
2023-08-02 15:31:10 +00:00
|
|
|
- status-success=test-suite (reef)
|
2021-08-19 14:17:29 +00:00
|
|
|
- or:
|
|
|
|
- and:
|
2021-09-28 13:23:22 +00:00
|
|
|
- label=no-API
|
2021-08-19 14:17:29 +00:00
|
|
|
- "#approved-reviews-by>=1"
|
|
|
|
- and:
|
|
|
|
- label=API
|
|
|
|
- "#approved-reviews-by>=2"
|
|
|
|
- and:
|
|
|
|
- label=API
|
|
|
|
- "#approved-reviews-by>=1"
|
|
|
|
- "updated-at<10 days ago"
|
2020-10-26 09:31:42 +00:00
|
|
|
actions:
|
2022-01-24 18:38:31 +00:00
|
|
|
queue: {}
|
2020-10-26 09:31:42 +00:00
|
|
|
dismiss_reviews: {}
|
|
|
|
delete_head_branch: {}
|
2022-01-24 18:38:31 +00:00
|
|
|
# Conflict resolution prompt
|
2020-10-26 09:31:42 +00:00
|
|
|
- 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? 🙏"
|