Skip to content

ci(mergify): remove obsolete queue configuration - #353

Merged
loveRhythm1990 merged 3 commits into
matrixorigin:mainfrom
loveRhythm1990:fix/mergify-config-20261021
Oct 21, 2026
Merged

loveRhythm1990 merged 3 commits into
matrixorigin:mainfrom
loveRhythm1990:fix/mergify-config-20261021

Conversation

@loveRhythm1990

@loveRhythm1990 loveRhythm1990 commented Oct 21, 2026 •

Copy link
Copy Markdown
Collaborator

What type of PR is this?

  • build / ci (build or CI changes)

What this PR does / why we need it

Behavior change: this proposal restores valid configuration, but does not restore automatic enqueueing with the currently reported product settings. Maintainers would use @mergifyio queue. The enqueueing policy needs a maintainer decision before merge.

Remove rejected queue_rules[].autoqueue and migrate commit_message_template to commit_message_format. Keep one approval, no do-not-merge, and base=main as queue-level conditions. Squash merging, timeout, concurrency, and GitHub branch protection remain unchanged. Approver attribution becomes standard Approved-by trailers.

Related: #285; configuration failures on #347, #348, and #350.

Enqueueing decision

  • Automatic: enable Merge Protections in the dashboard, then explicitly configure a conditional list (not unconditional true):

    merge_protections_settings:
      auto_merge_conditions:
        - "#approved-reviews-by>=1"
        - label!=do-not-merge
        - base=main

    This is an alternative, not included in the patch. Once autoqueue is removed, do not rely on the bot to migrate that field automatically.

  • Manual: accept this proposal and use @mergifyio queue for eligible PRs.

The live configuration check confirms Workflow Automation is disabled, so the retained pull_request_rules are inactive; this is now documented inline. The Merge Protections prerequisite comes from the bot's #285 notice; dashboard settings have not been independently verified or changed.

Validation

  • Official schema validation, parsed-YAML gate checks, and git diff --check passed.
  • Live Configuration changed passed on 999ccb4; the latest commit only adds comments and parses identically. Latest-head CI is pending.
  • No tracked references to the old approver-attribution syntax outside .mergify.yml were found.
  • Mergify Merge Queue still evaluates main's old configuration until merge, so its autoqueue error is separate from proposed-file validation.

Only .mergify.yml changes. No merge or product-setting changes performed.

@loveRhythm1990

Copy link
Copy Markdown
Collaborator Author

lgtm

@loveRhythm1990
loveRhythm1990 merged commit c3bb4b5 into matrixorigin:main Oct 21, 2026
6 of 7 checks passed
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.

1 participant