diff --git a/.github/mergify.yml b/.github/mergify.yml index 6c703b8ce61..28dbdac69ae 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -1,22 +1,18 @@ queue_rules: - name: default - conditions: + queue_conditions: - base=master - label=S:automerge - -pull_request_rules: - - name: Automerge to master - conditions: + merge_conditions: - base=master - label=S:automerge - actions: - queue: - method: squash - name: default - commit_message_template: | - {{ title }} (#{{ number }}) + commit_message_template: | + {{ title }} (#{{ number }}) + + {{ body }} + merge_method: squash - {{ body }} +pull_request_rules: - name: backport patches to v0.34.x branch conditions: - base=master @@ -41,3 +37,7 @@ pull_request_rules: backport: branches: - v0.36.x + - name: Automerge to master + conditions: [] + actions: + queue: