ci(mergify): upgrade configuration to current format (#686)

ci(mergify): upgrade configuration to current format Co-authored-by: Mergify <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: Satej <[email protected]> Co-authored-by: Daniel Flores <[email protected]> Co-authored-by: Omkar Hegde <[email protected]>
aws-actions · Jan 7, 2025 · 16f052e · 16f052e
1 parent e4d9480
commit 16f052e
Show file tree

Hide file tree

Showing 2 changed files with 147 additions and 77 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -1,10 +1,11 @@
 queue_rules:
   - name: default
-    conditions:
+    merge_conditions:
       # Conditions to get out of the queue (= merged)
       - status-success=Run Unit Tests
       - status-success=Semantic Pull Request
       - status-success=Analyze (javascript)
+    merge_method: squash
 
 pull_request_rules:
   - name: Automatically merge on CI success and review approval
@@ -23,7 +24,6 @@ pull_request_rules:
       - author!=dependabot[bot]
     actions:
       queue:
-        method: squash
         name: default
 
   - name: Automatically approve and merge Dependabot PRs
@@ -41,5 +41,4 @@ pull_request_rules:
       review:
         type: APPROVE
       queue:
-        method: squash
-        name: default
+        name: default