Merge branch 'main' into merge-back/2.178.0

aws · Feb 6, 2025 · 36507f1 · 36507f1
2 parents 2928a05 + 20176e6
commit 36507f1
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -20,13 +20,14 @@ queue_rules:
       {{ title }} (#{{ number }})
       {{ body }}
 
-  - name: default-squash
+  - name: priority-squash
     update_method: merge
     merge_method: squash
     conditions:
       - base!=release
       - -title~=(WIP|wip)
-      - -label~=(blocked|do-not-merge|no-squash|priority-pr)
+      - -label~=(blocked|do-not-merge|no-squash)
+      - label~=priority-pr
       - -merged
       - -closed
       - "#approved-reviews-by>=1"
@@ -39,14 +40,13 @@ queue_rules:
       {{ title }} (#{{ number }})
       {{ body }}
 
-  - name: priority-squash
+  - name: default-squash
     update_method: merge
     merge_method: squash
     conditions:
       - base!=release
       - -title~=(WIP|wip)
-      - -label~=(blocked|do-not-merge|no-squash)
-      - label~=priority-pr
+      - -label~=(blocked|do-not-merge|no-squash|priority-pr)
       - -merged
       - -closed
       - "#approved-reviews-by>=1"