From a4c3c22bff37db61059ceb558829aeed2610e388 Mon Sep 17 00:00:00 2001
From: Michael FIG <mfig@agoric.com>
Date: Fri, 14 Jun 2024 11:10:22 -0600
Subject: [PATCH] ci(mergify): consolidate `queue_conditions`

---
 .mergify.yml | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index cf0d5cb..bc88550 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -6,6 +6,12 @@ queue_rules:
 
       {{ body | trim }}
     queue_conditions:
+      - base=main
+      - or:
+          - check-pending=integration-test-result
+          - check-success=integration-test-result
+          - label=bypass:integration
+    merge_conditions:
       - base=main
       # Require integration tests before merging only
       - or:
@@ -20,10 +26,6 @@ pull_request_rules:
       - or:
           - '#commits-behind=0'
           - label=bypass:linear-history
-      - or:
-          - check-pending=integration-test-result
-          - check-success=integration-test-result
-          - label=bypass:integration
     actions:
       queue:
         name: main
@@ -32,10 +34,6 @@ pull_request_rules:
     conditions:
       - base=main
       - label=automerge:rebase
-      - or:
-          - check-pending=integration-test-result
-          - check-success=integration-test-result
-          - label=bypass:integration
     actions:
       queue:
         name: main
@@ -45,10 +43,6 @@ pull_request_rules:
     conditions:
       - base=main
       - label=automerge:squash
-      - or:
-          - check-pending=integration-test-result
-          - check-success=integration-test-result
-          - label=bypass:integration
     actions:
       queue:
         name: main