From b494300409d224a57feb68c363298a31a06c8627 Mon Sep 17 00:00:00 2001 From: lr90 Date: Wed, 21 Oct 2026 22:06:41 +0800 Subject: [PATCH 1/3] ci(mergify): remove obsolete queue configuration --- .mergify.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 6b3f04ff..3c9a30fb 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -10,13 +10,11 @@ pull_request_rules: queue_rules: - name: main merge_method: squash - commit_message_template: |- - {{ title }} (#{{ number }}) - - {{ body }} - - Approved by: @{{ approved_reviews_by | join(', @') }} + commit_message_format: + title: pr-title + body: pr-body + trailers: + - approved-by checks_timeout: 1 h - autoqueue: true merge_queue: max_parallel_checks: 1 From 999ccb4a425ad2b6750391eac6c9a8653528355b Mon Sep 17 00:00:00 2001 From: lr90 Date: Wed, 21 Oct 2026 22:08:35 +0800 Subject: [PATCH 2/3] ci(mergify): enforce eligibility at the queue boundary --- .mergify.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.mergify.yml b/.mergify.yml index 3c9a30fb..b4ca4ba7 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -9,6 +9,11 @@ pull_request_rules: name: main queue_rules: - name: main + # Enforce eligibility even when Workflow Automation is disabled. + queue_conditions: + - "#approved-reviews-by>=1" + - label!=do-not-merge + - base=main merge_method: squash commit_message_format: title: pr-title From 276eb63a171eef67062cf113e6190f7854df94d6 Mon Sep 17 00:00:00 2001 From: lr90 Date: Wed, 21 Oct 2026 22:19:50 +0800 Subject: [PATCH 3/3] docs(mergify): clarify inactive workflow rules --- .mergify.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.mergify.yml b/.mergify.yml index b4ca4ba7..aed7233d 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,3 +1,5 @@ +# Inactive until Workflow Automation is enabled for this repository. +# Keep these conditions aligned with queue_rules.main.queue_conditions. pull_request_rules: - name: Automatic merge on approval conditions: