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 #4522

Closed
wants to merge 1 commit into from
Closed
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
256 changes: 137 additions & 119 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,122 +1,140 @@
# Generated by .github/mergify/gen-config.sc
queue_rules:
- name: default
conditions:
- status-success=all tests passed
draft_bot_account: chiselbot
update_bot_account: chiselbot
merge_bot_account: chiselbot
pull_request_rules:
- name: automatic squash-and-merge on CI success and review
conditions:
- status-success=all tests passed
- '#approved-reviews-by>=1'
- '#changes-requested-reviews-by=0'
- base=main
- label="Please Merge"
- label!="DO NOT MERGE"
- label!="bp-conflict"
actions:
queue:
name: default
method: squash
update_method: merge
update_bot_account: chiselbot
merge_bot_account: chiselbot
- name: backport to 6.x
conditions:
- merged
- base=main
- milestone=6.x
actions:
backport:
branches:
- 6.x
labels:
- Backport
ignore_conflicts: true
label_conflicts: bp-conflict
label:
add:
- Backported
- name: backport to 5.x, 6.x
conditions:
- merged
- base=main
- milestone=5.x
actions:
backport:
branches:
- 5.x
- 6.x
labels:
- Backport
ignore_conflicts: true
label_conflicts: bp-conflict
label:
add:
- Backported
- name: backport to 3.6.x, 5.x, 6.x
conditions:
- merged
- base=main
- milestone=3.6.x
actions:
backport:
branches:
- 3.6.x
- 5.x
- 6.x
labels:
- Backport
ignore_conflicts: true
label_conflicts: bp-conflict
label:
add:
- Backported
- name: automatic squash-and-mege of 3.6.x backport PRs
conditions:
- status-success=all tests passed
- '#changes-requested-reviews-by=0'
- base=3.6.x
- label="Backport"
- label!="DO NOT MERGE"
- label!="bp-conflict"
actions:
queue:
name: default
method: squash
update_method: merge
update_bot_account: chiselbot
merge_bot_account: chiselbot
- name: automatic squash-and-mege of 5.x backport PRs
conditions:
- status-success=all tests passed
- '#changes-requested-reviews-by=0'
- base=5.x
- label="Backport"
- label!="DO NOT MERGE"
- label!="bp-conflict"
actions:
queue:
name: default
method: squash
update_method: merge
update_bot_account: chiselbot
merge_bot_account: chiselbot
- name: automatic squash-and-mege of 6.x backport PRs
conditions:
- status-success=all tests passed
- '#changes-requested-reviews-by=0'
- base=6.x
- label="Backport"
- label!="DO NOT MERGE"
- label!="bp-conflict"
actions:
queue:
name: default
method: squash
update_method: merge
update_bot_account: chiselbot
merge_bot_account: chiselbot
- name: duplicated default from automatic squash-and-mege of 3.6.x backport PRs
queue_conditions:
- status-success=all tests passed
- '#approved-reviews-by>=1'
- '#changes-requested-reviews-by=0'
- base=main
- label="Please Merge"
- label!="DO NOT MERGE"
- label!="bp-conflict"
- status-success=all tests passed
- '#changes-requested-reviews-by=0'
- base=3.6.x
- label="Backport"
- label!="DO NOT MERGE"
- label!="bp-conflict"
merge_conditions: []
draft_bot_account: chiselbot
update_bot_account: chiselbot
merge_bot_account: chiselbot
update_method: merge
merge_method: squash
- name: duplicated default from automatic squash-and-mege of 5.x backport PRs
queue_conditions:
- status-success=all tests passed
- '#approved-reviews-by>=1'
- '#changes-requested-reviews-by=0'
- base=main
- label="Please Merge"
- label!="DO NOT MERGE"
- label!="bp-conflict"
- status-success=all tests passed
- '#changes-requested-reviews-by=0'
- base=5.x
- label="Backport"
- label!="DO NOT MERGE"
- label!="bp-conflict"
merge_conditions: []
draft_bot_account: chiselbot
update_bot_account: chiselbot
merge_bot_account: chiselbot
update_method: merge
merge_method: squash
- name: duplicated default from automatic squash-and-mege of 6.x backport PRs
queue_conditions:
- status-success=all tests passed
- '#approved-reviews-by>=1'
- '#changes-requested-reviews-by=0'
- base=main
- label="Please Merge"
- label!="DO NOT MERGE"
- label!="bp-conflict"
- status-success=all tests passed
- '#changes-requested-reviews-by=0'
- base=6.x
- label="Backport"
- label!="DO NOT MERGE"
- label!="bp-conflict"
merge_conditions: []
draft_bot_account: chiselbot
update_bot_account: chiselbot
merge_bot_account: chiselbot
update_method: merge
merge_method: squash
- name: default
queue_conditions:
- status-success=all tests passed
- '#approved-reviews-by>=1'
- '#changes-requested-reviews-by=0'
- base=main
- label="Please Merge"
- label!="DO NOT MERGE"
- label!="bp-conflict"
merge_conditions:
- status-success=all tests passed
draft_bot_account: chiselbot
update_bot_account: chiselbot
merge_bot_account: chiselbot
update_method: merge
merge_method: squash

pull_request_rules:
- name: backport to 6.x
conditions:
- merged
- base=main
- milestone=6.x
actions:
backport:
branches:
- 6.x
labels:
- Backport
ignore_conflicts: true
label_conflicts: bp-conflict
label:
add:
- Backported
- name: backport to 5.x, 6.x
conditions:
- merged
- base=main
- milestone=5.x
actions:
backport:
branches:
- 5.x
- 6.x
labels:
- Backport
ignore_conflicts: true
label_conflicts: bp-conflict
label:
add:
- Backported
- name: backport to 3.6.x, 5.x, 6.x
conditions:
- merged
- base=main
- milestone=3.6.x
actions:
backport:
branches:
- 3.6.x
- 5.x
- 6.x
labels:
- Backport
ignore_conflicts: true
label_conflicts: bp-conflict
label:
add:
- Backported
- name: automatic squash-and-mege of 3.6.x backport PRs + automatic squash-and-mege
of 5.x backport PRs + automatic squash-and-mege of 6.x backport PRs + automatic
squash-and-merge on CI success and review
conditions: []
actions:
queue:
Loading