diff --git a/.mergify.yml b/.mergify.yml index f40380de2..a0e47d1af 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,20 +1,21 @@ queue_rules: - name: default - conditions: + queue_conditions: + - "#approved-reviews-by>0" + - label=automerge + merge_conditions: - or: - - base~=cosmos/ - - base~=chains/ + - base~=cosmos/ + - base~=chains/ + + commit_message_template: > + {{ title }} (#{{ number }}) + + {{ body }} + merge_method: squash pull_request_rules: - name: automerge with label automerge and branch protection passing - conditions: - - "#approved-reviews-by>0" - - label=automerge + conditions: [] actions: queue: - name: default - method: squash - commit_message_template: > - {{ title }} (#{{ number }}) - - {{ body }}