From 9055f0f3a16309f7bd9ee8e90b3ab8c05c2d545a Mon Sep 17 00:00:00 2001
From: teor <teor@riseup.net>
Date: Wed, 13 Apr 2022 10:28:03 +1000
Subject: [PATCH] ci(Mergify): configuration update (#4105)

Signed-off-by: teor <teor@riseup.net>
---
 .github/mergify.yml | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/.github/mergify.yml b/.github/mergify.yml
index 6f6a9c55..f73a5041 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -4,30 +4,37 @@ queue_rules:
     allow_checks_interruption: False
     speculative_checks: 2
     batch_size: 2
+    conditions:
+      # Mergify automatically applies status check, approval, and conversation rules,
+      # which are the same as the GitHub main branch protection rules
+      # https://docs.mergify.com/conditions/#about-branch-protection
+      - base=main
 
   - name: medium
     allow_inplace_checks: False
     allow_checks_interruption: False
     speculative_checks: 2
     batch_size: 3
+    conditions:
+      - base=main
 
   - name: low
     allow_inplace_checks: False
     allow_checks_interruption: False
     speculative_checks: 2
     batch_size: 4
+    conditions:
+      - base=main
 
 pull_request_rules:
   - name: move to urgent queue when CI passes with 1 review and not WIP targeting main
     conditions:
-      - '#approved-reviews-by>=1'
-      - '#review-threads-unresolved=0'
-      - -draft
       - base=main
+      - -draft
+      - label!=do-not-merge
       - or:
           - 'label~=^P-Critical'
           - 'label~=^P-High'
-      - label!=do-not-merge
     actions:
       queue:
         name: urgent
@@ -35,12 +42,10 @@ pull_request_rules:
 
   - name: move to medium queue when CI passes with 1 review and not WIP targeting main
     conditions:
-      - '#approved-reviews-by>=1'
-      - '#review-threads-unresolved=0'
-      - -draft
       - base=main
-      - 'label~=^P-Medium'
+      - -draft
       - label!=do-not-merge
+      - 'label~=^P-Medium'
     actions:
       queue:
         name: medium
@@ -48,10 +53,8 @@ pull_request_rules:
 
   - name: move to low queue when CI passes with 1 review and not WIP targeting main
     conditions:
-      - '#approved-reviews-by>=1'
-      - '#review-threads-unresolved=0'
-      - -draft
       - base=main
+      - -draft
       - label!=do-not-merge
       # This queue handles Low, Optional, and PRs with no priority label,
       # including automated dependabot PRs.