From 1a02f121ec9c7f6093f6aa04feb899c2441cfe11 Mon Sep 17 00:00:00 2001
From: Otavio Macedo <288203+otaviomacedo@users.noreply.github.com>
Date: Tue, 15 Oct 2024 17:34:57 +0100
Subject: [PATCH] chore(mergify): move deprecated parameters from
 `pull_request_rules` to `queue_rules` (#4670)

We are using deprecated parameters that are about to be removed (October 21st, 2024).

Ideally we should move away from Mergify and use GitHub merge queues. But the config for this repository is more complex, with many pull request rules. Let's avoid breaking the PRs for now and then we can come back and migrate to merge queues.

---

By submitting this pull request, I confirm that my contribution is made under the terms of the [Apache 2.0 license].

[Apache 2.0 license]: https://www.apache.org/licenses/LICENSE-2.0
---
 .mergify/config.yml | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/.mergify/config.yml b/.mergify/config.yml
index 5398c6f322..163a8412af 100644
--- a/.mergify/config.yml
+++ b/.mergify/config.yml
@@ -1,9 +1,24 @@
 # See https://doc.mergify.io
 queue_rules:
-  - name: default
+  - name: default-squash
     conditions:
       - status-success~=^jsii/superchain
       - status-success=Unit Tests
+    commit_message_template: |-
+      {{ title }} (#{{ number }})
+
+      {{ body }}
+    merge_method: squash
+
+  - name: default-merge
+    conditions:
+      - status-success~=^jsii/superchain
+      - status-success=Unit Tests
+    commit_message_template: |-
+      {{ title }} (#{{ number }})
+
+      {{ body }}
+    merge_method: merge
 
 pull_request_rules:
   - name: label core
@@ -42,12 +57,7 @@ pull_request_rules:
         approved: true
         changes_requested: false
       queue:
-        name: default
-        method: squash
-        commit_message_template: |-
-          {{ title }} (#{{ number }})
-
-          {{ body }}
+        name: default-squash
       comment:
         message: Merging (with squash)...
     conditions:
@@ -73,12 +83,7 @@ pull_request_rules:
         approved: true
         changes_requested: false
       queue:
-        name: default
-        method: merge
-        commit_message_template: |-
-          {{ title }} (#{{ number }})
-
-          {{ body }}
+        name: default-merge
       comment:
         message: Merging (no-squash)...
     conditions: