From 67624e3727bcc3b4ce3750579d23a5a7e9c68064 Mon Sep 17 00:00:00 2001 From: Fraz Arshad Date: Tue, 30 Jul 2024 14:54:19 +0500 Subject: [PATCH] ci: added a new high priority queue to mergify --- .mergify.yml | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 7876545d36d..59ae3bb3cc5 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,5 +1,30 @@ # Linear queue for the main branch. queue_rules: + - name: high_priority_main + commit_message_template: |- + {{ title }} (#{{ number }}) + + {{ body | trim }} + queue_conditions: + - base=master + - label=priority:high + - or: + - check-pending=integration-test-result + - check-success=integration-test-result + - label=bypass:integration + - or: + - and: # breakage succeeds like we thought + - check-success=breakage + - -label=proto:expect-breakage + - and: # breakage fails like we thought + - check-failure=breakage + - label=proto:expect-breakage + merge_conditions: + - base=master + # Require integration tests before merging only + - or: + - label=bypass:integration + - check-success=integration-test-result - name: main commit_message_template: |- {{ title }} (#{{ number }}) @@ -35,7 +60,6 @@ pull_request_rules: - label=bypass:linear-history actions: queue: - name: main merge_method: merge - name: rebase updates then merge to master conditions: @@ -43,7 +67,6 @@ pull_request_rules: - label=automerge:rebase actions: queue: - name: main merge_method: merge update_method: rebase - name: squash to master @@ -52,5 +75,4 @@ pull_request_rules: - label=automerge:squash actions: queue: - name: main merge_method: squash