fix(ci): migrate Mergify auto-enqueue to merge_protections_settings.auto_merge_conditions (rules-based path is EOL 2026-07-16) (#7216)

This commit is contained in:
Diego Rodrigues de Sa e Souza
2026-07-14 23:49:49 -03:00
committed by GitHub
parent fb24740b73
commit fb25ebdeb0

View File

@@ -17,6 +17,13 @@
# • Fallback path if Mergify misbehaves or the OSS plan changes: the manual # • Fallback path if Mergify misbehaves or the OSS plan changes: the manual
# merge-train runbook (docs/ops/MERGE_TRAIN.md) — remove labels, proceed by hand. # merge-train runbook (docs/ops/MERGE_TRAIN.md) — remove labels, proceed by hand.
# Auto-enqueue (current Mergify model, 2026): auto_merge_conditions in
# merge_protections_settings — the rules-based queue action / autoqueue path is
# deprecated (EOL 2026-07-16). The owner-applied `queue` label IS the approval.
merge_protections_settings:
auto_merge_conditions:
- label = queue
queue_rules: queue_rules:
- name: release - name: release
# Any current or future release branch — the reason GitHub's native queue was # Any current or future release branch — the reason GitHub's native queue was
@@ -46,18 +53,6 @@ queue_rules:
merge_method: squash merge_method: squash
pull_request_rules: pull_request_rules:
# AUTO-ENQUEUE trigger — queue_conditions alone only define ELIGIBILITY in current
# Mergify semantics (without this rule the PR sits at "use @Mergifyio queue",
# observed live on PR #7175). The conditions mirror queue_conditions on purpose.
- name: queue on owner-applied label
conditions:
- base~=^release/v\d+\.\d+\.\d+$
- label=queue
- -draft
- -conflict
actions:
queue:
name: release
- name: clean up the queue label after merge - name: clean up the queue label after merge
conditions: conditions:
- merged - merged