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?
Hey there! 👋
We've noticed that your Mergify configuration is using some deprecated fields.
No worries—we've got your back! This automated PR updates your config to align with the newest standards, ensuring everything keeps running smoothly.
Do not procrastinate! You must upgrade your configuration before 2025-01-31, otherwise your configuration will stop working.
What's Changed?
pull_request_rules → actions → queue → merge_method: To ease the configuration of queues, we are moving this attribute in thequeue_rulesdefinition. (deadline: 2025-01-31)Why This Matters
Keeping your configuration up-to-date means you'll benefit from the latest features and improvements Mergify has to offer. Plus, it helps prevent any unexpected hiccups down the road.
Got Questions? We've Got Answers! 🙌
Is this update safe to merge?
Absolutely! We've made sure the changes are compatible with your current setup. Your workflows should continue to work just as before—if not better!
Do I need to do anything special after merging?
Nope! Just merge this PR, and you're all set. If you have any custom configurations, it's a good idea to give them a quick look to ensure everything's in order.
What if I run into issues or have concerns?
We're here to help! Feel free to reach out to our support team anytime.
Thanks for being awesome and keeping your configuration up-to-date! If you have any thoughts or need a hand, don't hesitate to let us know.
Happy merging! 🎉