From a232afb9577aa6f3b387dfc9dd42611f01e8e5c2 Mon Sep 17 00:00:00 2001 From: Yicong-Huang <17627829+Yicong-Huang@users.noreply.github.com> Date: Thu, 30 Jul 2026 03:16:03 -0400 Subject: [PATCH] fix(ci): exclude gh-readonly-queue/**/* and dependabot/**/* from branch-creation ruleset to unfreeze the merge queue MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The Restrict Branch Creation ruleset (added in #7121) blocks creating any branch outside an allowlist. Its exclude for the merge queue's temp branches used refs/heads/gh-readonly-queue/*, but GitHub ruleset globs do not cross '/', and even a trailing ** only matches a single segment. The queue's temp branches nest the base ref and are multi-segment (gh-readonly-queue/main/pr-N, gh-readonly-queue/release/v1.2/pr-N), so they were NOT excluded — the creation rule blocked the queue from creating them, freezing merges to main and every release branch. Use gh-readonly-queue/**/*, which matches at any depth (verified empirically against the live GitHub rulesets API on a fork). Also allow dependabot/**/* (dependabot branches are likewise multi-segment). release/** and backport/** are kept as-is since those are single-segment. Co-Authored-By: Claude Opus 4.8 (1M context) --- .asf.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index f0ddaa602b7..07a88656480 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -137,13 +137,14 @@ github: include: - "~ALL" exclude: + # Globs don't cross '/' (even a trailing **), so use **/* to + # match branches at any depth under a prefix. - "refs/heads/main" - - "refs/heads/release/*" - - "refs/heads/backport/*" + - "refs/heads/release/**/*" + - "refs/heads/backport/**/*" - "refs/heads/gh-pages" - # Temporary branches GitHub's merge queue creates to test - # queued groups; must stay creatable or the queue breaks. - - "refs/heads/gh-readonly-queue/*" + - "refs/heads/dependabot/**/*" + - "refs/heads/gh-readonly-queue/**/*" bypass_actors: # apache/root — ASF Infra team. - actor_id: 118420