Merge pull request #13 from michaelfig/mfig-consolidate-mergify

ci(mergify): consolidate `queue_conditions`
Agoric · Jun 14, 2024 · 4c86871 · 4c86871
2 parents d37e700 + a4c3c22
commit 4c86871
Showing 1 changed file with 6 additions and 12 deletions.
diff --git 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