Open
Align Mergify queue with required up-to-date branch protection#21037
Conversation
Agent-Logs-Url: https://github.com/elastic/apm-server/sessions/b62a7a2c-6a49-4423-a023-5737e076794d Co-authored-by: v1v <2871786+v1v@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Fix Mergify configuration issues for branch protection
Align Mergify queue with required up-to-date branch protection
May 12, 2026
v1v
marked this pull request as ready for review
May 12, 2026 14:11
Contributor
|
This pull request does not have a backport label. Could you fix it @Copilot? 🙏
|
Contributor
|
This pull request is now in conflicts. Could you fix it @Copilot? 🙏 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Motivation/summary
GitHub branch protection (
Require branches to be up to date before merging) is incompatible with draft/two-step queue checks in the current Mergify setup. This PR switches Mergify to in-place checks so queueing and merging evaluate the same conditions.Merge queue settings
merge_queue.max_parallel_checks: 1.queue_rules.default.batch_size: 1.Single-phase CI gating
queue_rules.default.conditionswith:queue_conditionsmerge_conditionsChecklist
For functional changes, consider:
How to test these changes
Review
.mergify.ymland confirm:merge_queue.max_parallel_checksis1batch_sizeis1queue_conditionsandmerge_conditionsare present and identicalRelated issues
Branch protection + Mergify incompatibility reported in the “Mergify failed” issue context.