ci(mergify): upgrade configuration to current format

aws · Nov 28, 2024 · 69960f1 · 69960f1
1 parent 949daed
commit 69960f1
Showing 1 changed file with 54 additions and 25 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -1,39 +1,71 @@
 queue_rules:
-  - name: default
-    conditions:
+  - name: duplicated default from Merge for developers
+    queue_conditions:
+      - base~=(mainline|rename-commands)
+      - "#approved-reviews-by>=2"
+      - approved-reviews-by=@aws/aws-ecs-devx
+      - -approved-reviews-by~=author
+      - status-success=build (compile-linux)
+      - status-success=build (compile-windows)
+      - status-success=build (compile-darwin)
+      - status-success=test
+      - status-success=staticcheck
+      - status-success=license
+      - -label~=(WIP|do-not-merge)
+      - -title~=(WIP|wip)
+      - -merged
+      - -closed
+      - author!=dependabot[bot]
+    merge_conditions:
       - status-success=build (compile-linux)
       - status-success=build (compile-windows)
       - status-success=build (compile-darwin)
       - status-success=test
       - status-success=staticcheck
       - status-success=license
+    commit_message_template: |
+      {{ title }} (#{{ number }})
 
-pull_request_rules:
-  - name: Merge for developers
-    conditions:
-      - base~=(mainline|rename-commands)
-      - "#approved-reviews-by>=2"
-      - approved-reviews-by=@aws/aws-ecs-devx
-      - -approved-reviews-by~=author
+      {{ body }}
+    merge_method: squash
+  - name: duplicated default from Merge for bots
+    queue_conditions:
+      - base=mainline
+      - "#approved-reviews-by>=1"
+      - "#changes-requested-reviews-by=0"
       - status-success=build (compile-linux)
       - status-success=build (compile-windows)
       - status-success=build (compile-darwin)
       - status-success=test
       - status-success=staticcheck
       - status-success=license
-      - -label~=(WIP|do-not-merge)
+      - author=dependabot[bot]
       - -title~=(WIP|wip)
+      - -label~=(WIP|do-not-merge)
       - -merged
       - -closed
-      - author!=dependabot[bot]
-    actions:
-      queue:
-        name: default
-        method: squash
-        commit_message_template: |
-          {{ title }} (#{{ number }})
+    merge_conditions:
+      - status-success=build (compile-linux)
+      - status-success=build (compile-windows)
+      - status-success=build (compile-darwin)
+      - status-success=test
+      - status-success=staticcheck
+      - status-success=license
+    commit_message_template: |
+      {{ title }} (#{{ number }})
+
+      {{ body }}
+    merge_method: squash
+  - name: default
+    conditions:
+      - status-success=build (compile-linux)
+      - status-success=build (compile-windows)
+      - status-success=build (compile-darwin)
+      - status-success=test
+      - status-success=staticcheck
+      - status-success=license
 
-          {{ body }}
+pull_request_rules:
   - name: Merge for bots
     conditions:
       - base=mainline
@@ -53,13 +85,6 @@ pull_request_rules:
     actions:
       review:
         type: APPROVE
-      queue:
-        name: default
-        method: squash
-        commit_message_template: |
-          {{ title }} (#{{ number }})
-
-          {{ body }}
   - name: Ask Japanese docs reviews
     conditions:
       - files~=\.ja.md$
@@ -68,3 +93,7 @@ pull_request_rules:
       request_reviews:
         users:
           - hkford
+  - name: Merge for bots + Merge for developers
+    conditions: []
+    actions:
+      queue: