Skip to content

Commit

Permalink
chore(mergify): move deprecated parameters from pull_request_rules
Browse files Browse the repository at this point in the history
…to `queue_rules` (#4670)

We are using deprecated parameters that are about to be removed (October 21st, 2024).

Ideally we should move away from Mergify and use GitHub merge queues. But the config for this repository is more complex, with many pull request rules. Let's avoid breaking the PRs for now and then we can come back and migrate to merge queues.

---

By submitting this pull request, I confirm that my contribution is made under the terms of the [Apache 2.0 license].

[Apache 2.0 license]: https://www.apache.org/licenses/LICENSE-2.0
  • Loading branch information
otaviomacedo authored Oct 15, 2024
1 parent 76b99a9 commit 1a02f12
Showing 1 changed file with 18 additions and 13 deletions.
31 changes: 18 additions & 13 deletions .mergify/config.yml
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

0 comments on commit 1a02f12

Please sign in to comment.