Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci(mergify): upgrade configuration to current format #975

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 23 additions & 19 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
@@ -1,27 +1,26 @@
queue_rules:
- name: default
conditions:
- check-success=Build

pull_request_rules:
- name: automatic merge for master when reviewed and CI passes
conditions:
- name: duplicated default from automatic merge for master when reviewed and CI
passes
queue_conditions:
- "#approved-reviews-by>=1"
- base=master
- label=ready-to-merge
actions:
queue:
name: default
method: squash
- name: automatic merge for updates when CI passes
conditions:
merge_conditions:
- check-success=Build
merge_method: squash
- name: duplicated default from automatic merge for updates when CI passes
queue_conditions:
- "#approved-reviews-by>=1"
- base=master
- label=dependencies
actions:
queue:
name: default
method: squash
merge_conditions:
- check-success=Build
merge_method: squash
- name: default
conditions:
- check-success=Build

pull_request_rules:
- name: delete head branch after merge
conditions:
- merged
Expand All @@ -31,5 +30,10 @@ pull_request_rules:
conditions:
- conflict
actions:
comment:
message: This pull request has conflict. Could you fix it @{{author}}?
comment:
message: This pull request has conflict. Could you fix it @{{author}}?
- name: automatic merge for master when reviewed and CI passes + automatic merge
for updates when CI passes
conditions: []
actions:
queue:
Loading