diff --git a/.mergify/config.yml b/.mergify/config.yml index 5398c6f322..163a8412af 100644 --- a/.mergify/config.yml +++ b/.mergify/config.yml @@ -1,9 +1,24 @@ # See https://doc.mergify.io queue_rules: - - name: default + - name: default-squash conditions: - status-success~=^jsii/superchain - status-success=Unit Tests + commit_message_template: |- + {{ title }} (#{{ number }}) + + {{ body }} + merge_method: squash + + - name: default-merge + conditions: + - status-success~=^jsii/superchain + - status-success=Unit Tests + commit_message_template: |- + {{ title }} (#{{ number }}) + + {{ body }} + merge_method: merge pull_request_rules: - name: label core @@ -42,12 +57,7 @@ pull_request_rules: approved: true changes_requested: false queue: - name: default - method: squash - commit_message_template: |- - {{ title }} (#{{ number }}) - - {{ body }} + name: default-squash comment: message: Merging (with squash)... conditions: @@ -73,12 +83,7 @@ pull_request_rules: approved: true changes_requested: false queue: - name: default - method: merge - commit_message_template: |- - {{ title }} (#{{ number }}) - - {{ body }} + name: default-merge comment: message: Merging (no-squash)... conditions: