Skip to content

[8.19](backport #6972) ci(mergify): upgrade configuration to current format#6975

Merged
ebeahan merged 2 commits into
8.19from
mergify/bp/8.19/pr-6972
May 8, 2026
Merged

[8.19](backport #6972) ci(mergify): upgrade configuration to current format#6975
ebeahan merged 2 commits into
8.19from
mergify/bp/8.19/pr-6972

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented May 6, 2026

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 2026-07-31, otherwise your configuration will stop working.

What's Changed?

  • queue_rules → conditions: conditions in queue rule configuration is deprecated. Use merge_conditions instead. (deadline: 2026-07-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! 🎉


This is an automatic backport of pull request #6972 done by Mergify.

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit 0b31a09)

# Conflicts:
#	.mergify.yml
@mergify mergify Bot requested a review from a team as a code owner May 6, 2026 17:30
@mergify mergify Bot requested review from macdewee and swiatekm May 6, 2026 17:30
@mergify mergify Bot added backport conflicts There is a conflict in the backported pull request labels May 6, 2026
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented May 6, 2026

Cherry-pick of 0b31a09 has failed:

On branch mergify/bp/8.19/pr-6972
Your branch is up to date with 'origin/8.19'.

You are currently cherry-picking commit 0b31a09.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .mergify.yml

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@swiatekm
Copy link
Copy Markdown
Member

swiatekm commented May 8, 2026

@copilot resolve the merge conflict

Copy link
Copy Markdown
Contributor

Copilot AI commented May 8, 2026

@copilot resolve the merge conflict

Resolved in ff5c1eb: I removed the merge conflict markers from .mergify.yml and kept the updated merge_method/merge_conditions queue rule format, which fixes the pre-commit conflict check failure.

@ebeahan
Copy link
Copy Markdown
Member

ebeahan commented May 8, 2026

/test

@ebeahan ebeahan enabled auto-merge (squash) May 8, 2026 15:00
@ebeahan ebeahan merged commit 9744e69 into 8.19 May 8, 2026
7 checks passed
@ebeahan ebeahan deleted the mergify/bp/8.19/pr-6972 branch May 8, 2026 17:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport conflicts There is a conflict in the backported pull request skip-changelog

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants