From 91c8840f1478ca12ab4b61f2f9e2803bad85124d Mon Sep 17 00:00:00 2001
From: Mergify <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu, 5 Dec 2024 05:51:21 +0000
Subject: [PATCH] ci(mergify): upgrade configuration to current format

---
 .github/mergify.yml | 43 ++++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/.github/mergify.yml b/.github/mergify.yml
index eacdb802e324..79194588ca91 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -6,36 +6,32 @@ queue_rules:
     queue_conditions:
       - "label!=C-urgent"
       - author!=dependabot[bot]
+      - and:
+          - "#review-threads-unresolved=0"
+          - "#approved-reviews-by>=1"
+          - "#changes-requested-reviews-by=0"
+          - "label!=do-not-merge"
+          - "label!=multiple-reviewers"
+          - "label!=mergify-ignore"
+          - "label!=M-do-not-merge"
+          - "label!=M-multiple-reviewers"
+          - "label!=M-mergify-ignore"
+          - "base=develop"
+    merge_conditions: []
+    merge_bot_account: OptimismBot
+    merge_method: merge
   - name: lowpriority
     queue_conditions:
       - author=dependabot[bot]
 
 pull_request_rules:
-  - name: Automatic merge on approval
-    conditions:
-      - and:
-        - "#review-threads-unresolved=0"
-        - "#approved-reviews-by>=1"
-        - "#changes-requested-reviews-by=0"
-        - "label!=do-not-merge"
-        - "label!=multiple-reviewers"
-        - "label!=mergify-ignore"
-        - "label!=M-do-not-merge"
-        - "label!=M-multiple-reviewers"
-        - "label!=M-mergify-ignore"
-        - "base=develop"
-    actions:
-      queue:
-        name: default
-        method: merge
-        merge_bot_account: OptimismBot
   - name: Add merge train label
     conditions:
       - "queue-position >= 0"
     actions:
       comment:
-          message: |
-            This PR has been added to the merge queue, and will be merged soon.
+        message: |
+          This PR has been added to the merge queue, and will be merged soon.
       label:
         add:
           - S-on-merge-train
@@ -51,7 +47,8 @@ pull_request_rules:
       - conflict
     actions:
       comment:
-        message: Hey @{{author}}! This PR has merge conflicts. Please fix them before continuing review.
+        message: Hey @{{author}}! This PR has merge conflicts. Please fix them before
+          continuing review.
       label:
         add:
           - S-conflict
@@ -321,3 +318,7 @@ pull_request_rules:
       label:
         add:
           - M-ci
+  - name: Automatic merge on approval
+    conditions: []
+    actions:
+      queue: