diff --git a/.mergify.yml b/.mergify.yml index 6e60f125039..eecd3e26521 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,136 +1,145 @@ # Generated by .github/mergify/gen-config.sc queue_rules: -- name: 3.6.x merge queue - queue_conditions: - - status-success=all tests passed - - base=3.6.x - - '#changes-requested-reviews-by=0' - - label="Backport" - - 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 -- name: 5.x merge queue - queue_conditions: - - status-success=all tests passed - - base=5.x - - '#changes-requested-reviews-by=0' - - label="Backport" - - 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 -- name: 6.x merge queue - queue_conditions: - - status-success=all tests passed - - base=6.x - - '#changes-requested-reviews-by=0' - - label="Backport" - - 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 + - name: 3.6.x merge queue + queue_conditions: + - status-success=all tests passed + - base=3.6.x + - '#changes-requested-reviews-by=0' + - label="Backport" + - 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 + - name: 5.x merge queue + queue_conditions: + - status-success=all tests passed + - base=5.x + - '#changes-requested-reviews-by=0' + - label="Backport" + - 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 + - name: 6.x merge queue + queue_conditions: + - status-success=all tests passed + - base=6.x + - '#changes-requested-reviews-by=0' + - label="Backport" + - 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 pull_request_rules: -- name: backport to 6.x - conditions: - - merged - - milestone=6.x - actions: - backport: - branches: - - 6.x - labels: - - Backport - ignore_conflicts: true - merge_conflict_style: diff3 - label_conflicts: bp-conflict - bot_account: chiselbot - report_mode: - - comment - label: - add: - - Backported -- name: backport to 5.x, 6.x - conditions: - - merged - - milestone=5.x - actions: - backport: - branches: - - 5.x - - 6.x - labels: - - Backport - ignore_conflicts: true - merge_conflict_style: diff3 - label_conflicts: bp-conflict - bot_account: chiselbot - report_mode: - - comment - label: - add: - - Backported -- name: backport to 3.6.x, 5.x, 6.x - conditions: - - merged - - milestone=3.6.x - actions: - backport: - branches: - - 3.6.x - - 5.x - - 6.x - labels: - - Backport - ignore_conflicts: true - merge_conflict_style: diff3 - label_conflicts: bp-conflict - bot_account: chiselbot - report_mode: - - comment - label: - add: - - Backported -- name: queue 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: 3.6.x merge queue -- name: queue 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: 5.x merge queue -- name: queue 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: 6.x merge queue + - name: backport to 6.x + conditions: + - merged + - milestone=6.x + actions: + backport: + branches: + - 6.x + labels: + - Backport + ignore_conflicts: true + merge_conflict_style: diff3 + label_conflicts: bp-conflict + bot_account: chiselbot + report_mode: + - comment + label: + add: + - Backported + - name: backport to 5.x, 6.x + conditions: + - merged + - milestone=5.x + actions: + backport: + branches: + - 5.x + - 6.x + labels: + - Backport + ignore_conflicts: true + merge_conflict_style: diff3 + label_conflicts: bp-conflict + bot_account: chiselbot + report_mode: + - comment + label: + add: + - Backported + - name: backport to 3.6.x, 5.x, 6.x + conditions: + - merged + - milestone=3.6.x + actions: + backport: + branches: + - 3.6.x + - 5.x + - 6.x + labels: + - Backport + ignore_conflicts: true + merge_conflict_style: diff3 + label_conflicts: bp-conflict + bot_account: chiselbot + report_mode: + - comment + label: + add: + - Backported + - name: queue 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: 3.6.x merge queue + - name: queue 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: 5.x merge queue + - name: queue 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: 6.x merge queue +priority_rules: + - name: priority for queue `3.6.x merge queue` + conditions: + - base=3.6.x + priority: 2500 + - name: priority for queue `5.x merge queue` + conditions: + - base=5.x + priority: 2250