From 309e85c7751dc5855ce77f6d195a65ab80488d77 Mon Sep 17 00:00:00 2001
From: Mergify <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu, 28 Nov 2024 08:25:53 +0000
Subject: [PATCH] ci(mergify): upgrade configuration to current format

---
 .mergify.yml | 60 ++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 47 insertions(+), 13 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index 876d88127a..a1a88ca7c8 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,4 +1,42 @@
 queue_rules:
+  - name: duplicated default from Automatically merge on CI success and review
+    queue_conditions:
+      - base=master
+      - status-success=build
+      - "label=ready to merge"
+      - "approved-reviews-by=@oss-approvers"
+    merge_conditions:
+      - status-success=build
+    merge_method: squash
+  - name: duplicated default from Automatically merge release branch changes on CI
+      success and release manager review
+    queue_conditions:
+      - base~=^release-
+      - status-success=build
+      - "label=ready to merge"
+      - "approved-reviews-by=@release-managers"
+    merge_conditions:
+      - status-success=build
+    merge_method: squash
+  - name: duplicated default from Automatically merge PRs from maintainers on CI success
+      and review
+    queue_conditions:
+      - base=master
+      - status-success=build
+      - "label=ready to merge"
+      - "author=@oss-approvers"
+    merge_conditions:
+      - status-success=build
+    merge_method: squash
+  - name: duplicated default from Automatically merge autobump PRs on CI success
+    queue_conditions:
+      - base~=^(master|release-)
+      - status-success=build
+      - "label~=autobump-*"
+      - "author:spinnakerbot"
+    merge_conditions:
+      - status-success=build
+    merge_method: squash
   - name: default
     conditions:
       - status-success=build
@@ -11,21 +49,16 @@ pull_request_rules:
       - "label=ready to merge"
       - "approved-reviews-by=@oss-approvers"
     actions:
-      queue:
-        method: squash
-        name: default
       label:
         add: ["auto merged"]
-  - name: Automatically merge release branch changes on CI success and release manager review
+  - name: Automatically merge release branch changes on CI success and release manager
+      review
     conditions:
       - base~=^release-
       - status-success=build
       - "label=ready to merge"
       - "approved-reviews-by=@release-managers"
     actions:
-      queue:
-        method: squash
-        name: default
       label:
         add: ["auto merged"]
   - name: Automatically merge PRs from maintainers on CI success and review
@@ -35,9 +68,6 @@ pull_request_rules:
       - "label=ready to merge"
       - "author=@oss-approvers"
     actions:
-      queue:
-        method: squash
-        name: default
       label:
         add: ["auto merged"]
   - name: Automatically merge autobump PRs on CI success
@@ -47,9 +77,6 @@ pull_request_rules:
       - "label~=autobump-*"
       - "author:spinnakerbot"
     actions:
-      queue:
-        method: squash
-        name: default
       label:
         add: ["auto merged"]
   - name: Request reviews for autobump PRs on CI failure
@@ -61,3 +88,10 @@ pull_request_rules:
     actions:
       request_reviews:
         teams: ["oss-approvers"]
+  - name: Automatically merge PRs from maintainers on CI success and review + Automatically
+      merge autobump PRs on CI success + Automatically merge on CI success and review
+      + Automatically merge release branch changes on CI success and release manager
+      review
+    conditions: []
+    actions:
+      queue: