ci(mergify): upgrade configuration to current format

winglang · Nov 25, 2024 · fcce23f · fcce23f
1 parent 23a46ae
commit fcce23f
Showing 1 changed file with 48 additions and 15 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -1,20 +1,55 @@
 queue_rules:
+  - name: duplicated default from Automatic merge on successful docsite update from
+      bot
+    queue_conditions:
+      - "#approved-reviews-by>=1"
+      - -label~=(do-not-merge)
+      - status-success=build
+      - status-success=Vercel
+      - -merged
+      - -closed
+      - "#changes-requested-reviews-by=0"
+      - "#review-threads-unresolved=0"
+      - "title=feat(docs): update docs"
+      - "#commits=1"
+      - -label~=(do-not-merge)
+      - status-success=build
+      - status-success=Vercel
+      - author=monadabot
+      - -merged
+      - -closed
+      - "#changes-requested-reviews-by=0"
+      - "#review-threads-unresolved=0"
+    merge_conditions: []
+    commit_message_template: |-
+      {{ title }} (#{{ number }})
+
+      {{ body }}
+    merge_method: squash
   - name: default
-    conditions:
+    queue_conditions:
+      - "#approved-reviews-by>=1"
+      - -label~=(do-not-merge)
+      - status-success=build
+      - status-success=Vercel
+      - -merged
+      - -closed
+      - "#changes-requested-reviews-by=0"
+      - "#review-threads-unresolved=0"
+    merge_conditions:
       - status-success=build
       - status-success=Vercel
       - -label~=(do-not-merge)
+    commit_message_template: |-
+      {{ title }} (#{{ number }})
+
+      {{ body }}
+    merge_method: squash
+
 pull_request_rules:
   - name: Automatic merge on approval and successful build
     actions:
       delete_head_branch: {}
-      queue:
-        method: squash
-        name: default
-        commit_message_template: |-
-          {{ title }} (#{{ number }})
-
-          {{ body }}
     conditions:
       - "#approved-reviews-by>=1"
       - -label~=(do-not-merge)
@@ -27,13 +62,6 @@ pull_request_rules:
   - name: Automatic merge on successful docsite update from bot
     actions:
       delete_head_branch: {}
-      queue:
-        method: squash
-        name: default
-        commit_message_template: |-
-          {{ title }} (#{{ number }})
-
-          {{ body }}
     conditions:
       - "title=feat(docs): update docs"
       - "#commits=1"
@@ -45,3 +73,8 @@ pull_request_rules:
       - -closed
       - "#changes-requested-reviews-by=0"
       - "#review-threads-unresolved=0"
+  - name: Automatic merge on approval and successful build + Automatic merge on successful
+      docsite update from bot
+    conditions: []
+    actions:
+      queue: