ci(mergify): upgrade configuration to current format #686
Conversation
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
mergify
bot
force-pushed
the
mergify/configuration-deprecated-update
branch
from
c0c66d6 to
904376c
Compare
mergify
bot
force-pushed
the
mergify/configuration-deprecated-update
branch
from
904376c to
a27c3db
Compare
There was a problem hiding this comment.
The code in this PR duplicates some logic unnecessarily, and is generally hard to read.
From the PR description, the deprecated object is pull_request_rules → actions → queue → method, which is present in the old file at lines 26, 44. To migrate to merge_method, we should likely be fine with removing these lines and then adding a single line in queue_rules:
merge_method: squash
We might also need to rename queue_rules->conditions to queue_rules->merge_conditions.
.mergify.yml
Outdated
| - name: Automatically merge on CI success and review approval | ||
| conditions: | ||
| - name: duplicated default from Automatically merge on CI success and review approval | ||
| queue_conditions: |
There was a problem hiding this comment.
queue_rules->queue_conditions logic is duplicated from thepull_request_rules -> conditions for the condition named "for "Automatically merge on CI success and review approval"
| queue: | ||
| method: squash | ||
| name: default | ||
| merge_conditions: |
There was a problem hiding this comment.
queue_rules->merge_conditions replaces the oldqueue_rules "default" conditions logic
.mergify.yml
Outdated
| - status-success=Analyze (javascript) | ||
| merge_method: squash | ||
| - name: duplicated default from Automatically approve and merge Dependabot PRs | ||
| queue_conditions: |
There was a problem hiding this comment.
again, duplicated from pull_request_rules -> conditions for the condition named "Automatically approve and merge Dependabot PRs"
.mergify.yml
Outdated
| - -label~=(blocked|do-not-merge) | ||
| - -merged | ||
| - -closed | ||
| merge_conditions: |
There was a problem hiding this comment.
duplicated merge_conditions
.mergify.yml
Outdated
| @@ -40,6 +58,8 @@ pull_request_rules: | |||
| actions: | |||
| review: | |||
| type: APPROVE | |||
| - name: Automatically approve and merge Dependabot PRs + Automatically merge on | |||
There was a problem hiding this comment.
This step seems incomplete?
|
LGTM |
No more deprecated fields are being used in your Mergify configuration, this pull request will be closed.