Skip to content

Align Mergify queue with required up-to-date branch protection - #21037

Open
v1v with Copilot wants to merge 2 commits into
mainfrom
copilot/fix-mergify-failed
Open

Align Mergify queue with required up-to-date branch protection#21037
v1v with Copilot wants to merge 2 commits into
mainfrom
copilot/fix-mergify-failed

Conversation

Copilot AI commented May 12, 2026

Copy link
Copy Markdown
Contributor

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

    • Added merge_queue.max_parallel_checks: 1.
    • Set queue_rules.default.batch_size: 1.
  • Single-phase CI gating

    • Replaced queue_rules.default.conditions with:
      • queue_conditions
      • merge_conditions
    • Kept both condition sets identical to avoid two-step CI behavior.
merge_queue:
  max_parallel_checks: 1

queue_rules:
  - name: default
    batch_size: 1
    queue_conditions: &required_checks
      - check-success=test (macos-latest)
      - or:
        - check-success=test (windows-2025)
        - check-success=test (windows-latest)
      - check-success=system-test
      - check-success=lint
      - check-success=CLA
    merge_conditions: *required_checks

Checklist

For functional changes, consider:

  • Is it observable through the addition of either logging or metrics?
  • Is its use being published in telemetry to enable product improvement?
  • Have system tests been added to avoid regression?

How to test these changes

Review .mergify.yml and confirm:

  • merge_queue.max_parallel_checks is 1
  • default queue rule batch_size is 1
  • queue_conditions and merge_conditions are present and identical

Related issues

Branch protection + Mergify incompatibility reported in the “Mergify failed” issue context.

Copilot AI assigned Copilot and v1v May 12, 2026
Copilot AI linked an issue May 12, 2026 that may be closed by this pull request
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
Copilot finished work on behalf of v1v May 12, 2026 13:55
Copilot AI requested a review from v1v May 12, 2026 13:55
@v1v
v1v marked this pull request as ready for review May 12, 2026 14:11
@v1v
v1v requested a review from a team as a code owner May 12, 2026 14:11
@mergify

mergify Bot commented May 12, 2026

Copy link
Copy Markdown
Contributor

This pull request does not have a backport label. Could you fix it @Copilot? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-8.19 is the label to automatically backport to the 8.19 branch.
  • backport-9./d is the label to automatically backport to the 9./d branch. /d is the digit.
  • backport-active-all is the label that automatically backports to all active branches.
  • backport-active-9 is the label that automatically backports to all active minor branches for the 9 major.

@endorama endorama left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm trusting @v1v review on correctness, approving to unblock

@mergify

mergify Bot commented Jun 4, 2026

Copy link
Copy Markdown
Contributor

This pull request is now in conflicts. Could you fix it @Copilot? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b copilot/fix-mergify-failed upstream/copilot/fix-mergify-failed
git merge upstream/main
git push upstream copilot/fix-mergify-failed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Mergify failed

3 participants