diff --git a/.mergify.yml b/.mergify.yml index 0681d37f..b563b6d3 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,7 +1,7 @@ queue_rules: - name: default speculative_checks: 2 - conditions: + queue_conditions: - -files=.mergify.yml pull_request_rules: - name: automatic merge @@ -13,7 +13,7 @@ pull_request_rules: if `{{head}}` is up-to-date with `{{base}}` and the queue is empty. queue: name: default - method: squash + merge_method: squash commit_message_template: |- {{ title }} (#{{ number }}) {{ body }} diff --git a/.mkrepo/mergify.w b/.mkrepo/mergify.w index 60ef91e9..d68e6cd9 100644 --- a/.mkrepo/mergify.w +++ b/.mkrepo/mergify.w @@ -18,7 +18,7 @@ pub class MergifyWorkflow { { "name": "default", "speculative_checks": 2, - "conditions": [ + "queue_conditions": [ "-files=.mergify.yml", ] } @@ -32,7 +32,7 @@ pub class MergifyWorkflow { }, "queue": { "name": "default", - "method": "squash", + "merge_method": "squash", "commit_message_template": "\{\{ title \}\} (#\{\{ number \}\})\n\{\{ body \}\}" } },