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

---
 .mergify.yml | 47 ++++++++++++++++++++++++++++++++---------------
 1 file changed, 32 insertions(+), 15 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index 37d006e0..9174b6cc 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,13 +1,6 @@
 queue_rules:
-  - name: default
-    conditions:
-    # Conditions to get out of the queue (= merged)
-      - status-success=Run Unit Tests
-      - status-success=Semantic Pull Request
-
-pull_request_rules:
-  - name: Automatically merge on CI success and review approval
-    conditions:
+  - name: duplicated default from Automatically merge on CI success and review approval
+    queue_conditions:
       - base~=master|integ-tests
       - "#approved-reviews-by>=1"
       - approved-reviews-by=@aws-actions/aws-ecs-devx
@@ -19,11 +12,33 @@ pull_request_rules:
       - -merged
       - -closed
       - author!=dependabot[bot]
-    actions:
-      queue:
-        method: squash
-        name: default
+    merge_conditions:
+    # Conditions to get out of the queue (= merged)
+      - status-success=Run Unit Tests
+      - status-success=Semantic Pull Request
+    merge_method: squash
+  - name: duplicated default from Automatically approve and merge Dependabot PRs
+    queue_conditions:
+      - base=master
+      - author=dependabot[bot]
+      - status-success=Run Unit Tests
+      - status-success=Semantic Pull Request
+      - -title~=(WIP|wip)
+      - -label~=(blocked|do-not-merge)
+      - -merged
+      - -closed
+    merge_conditions:
+    # Conditions to get out of the queue (= merged)
+      - status-success=Run Unit Tests
+      - status-success=Semantic Pull Request
+    merge_method: squash
+  - name: default
+    conditions:
+    # Conditions to get out of the queue (= merged)
+      - status-success=Run Unit Tests
+      - status-success=Semantic Pull Request
 
+pull_request_rules:
   - name: Automatically approve and merge Dependabot PRs
     conditions:
       - base=master
@@ -37,6 +52,8 @@ pull_request_rules:
     actions:
       review:
         type: APPROVE
+  - name: Automatically approve and merge Dependabot PRs + Automatically merge on
+      CI success and review approval
+    conditions: []
+    actions:
       queue:
-        method: squash
-        name: default