Skip to content

Commit

Permalink
ci(mergify): upgrade configuration to current format
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] committed Nov 22, 2024
1 parent d06d090 commit 3af2e0a
Showing 1 changed file with 140 additions and 119 deletions.
259 changes: 140 additions & 119 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,122 +1,143 @@
# 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
merge_method: squash
update_method: 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
merge_method: squash
update_method: 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
merge_method: squash
update_method: 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
merge_method: squash
update_method: merge

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:

0 comments on commit 3af2e0a

Please sign in to comment.