Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(mergify): move deprecated parameters from pull_request_rules to queue_rules #4670

Merged
merged 2 commits into from
Oct 15, 2024
Merged

chore(mergify): move deprecated parameters from pull_request_rules to queue_rules #4670

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81a7492
chore(mergify): move deprecated parameters from `pull_request_rules` …
otaviomacedo Oct 15, 2024
285916b
Split merge and squash queues
otaviomacedo Oct 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 18 additions & 13 deletions .mergify/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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:
Expand All @@ -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:
Expand Down
Loading