ci: change automerge conditions of Mergify (#523)

* ci: change automerge conditions of Mergify * ci: change automerge conditions of Mergify
Finschia · May 9, 2022 · be2ba3e · be2ba3e
1 parent fc3ab2c
commit be2ba3e
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -1,10 +1,18 @@
+queue_rules:
+  - name: default
+    conditions:
+      - "#approved-reviews-by>1"
+
 pull_request_rules:
-  - name: automerge to master with label automerge and branch protection passing
+  - name: automerge to main with label automerge and branch protection passing
     conditions:
       - "#approved-reviews-by>1"
-      - base=master
+      - base=main
       - label=automerge
     actions:
-      merge:
+      queue:
+        name: default
         method: squash
-        strict: true
+        commit_message_template: |
+          {{ title }} (#{{ number }})
+          {{ body }}