diff --git a/.github/mergify.yml b/.github/mergify.yml index e01afbd5ed2ac9bdcc548014fde06a5006103b64..52e2c817090f86e160472e0b1c8e74d62c0686c9 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -6,7 +6,7 @@ priority_rules: - name: high priority conditions: - 'label=priority: high :fire:' - priority: high + priority: 3000 # The idea is we slightly prioritize those PRs because we're in # a release cycle if a PR matches. @@ -14,9 +14,18 @@ priority_rules: conditions: - 'base~=^3\.' - 'label!=backport' - # 'normal' is 2000, 'high' is 3000 priority: 2500 + - name: priority for queue `default` + conditions: + - queue-name=default + priority: 2250 + + - name: priority for queue `squash-merge` + conditions: + - queue-name=squash-merge + priority: 2250 + pull_request_rules: # implementing PR delay logic: apply a label after 2 days of inactivity @@ -28,12 +37,12 @@ pull_request_rules: name: Wait for 2 days before validating merge conditions: - or: - - 'label=priority: high :fire:' - - updated-at<2 days ago + - 'label=priority: high :fire:' + - updated-at<2 days ago - or: - - label=merge me - - label=squash+merge me - - label=merge+no rebase + - label=merge me + - label=squash+merge me + - label=merge+no rebase - '#approved-reviews-by>=2' # label when Mergify is ready but waiting for the above @@ -47,9 +56,9 @@ pull_request_rules: - -draft - -closed - or: - - label=merge me - - label=squash+merge me - - label=merge+no rebase + - label=merge me + - label=squash+merge me + - label=merge+no rebase - '#approved-reviews-by>=2' - '#changes-requested-reviews-by=0' # oy