From 60538d1508a71563bde3330900c8b7aa74da9d54 Mon Sep 17 00:00:00 2001 From: ework-agent Date: Mon, 12 Oct 2026 11:20:43 +0800 Subject: [PATCH] fix: allow bugfix-release/* carve-out branches in ci.yml version-guard #2853 made the carve-out channel PR-gated with bugfix-release/* as the marker prefix, but ci.yml version-guard still only whitelisted *_release-v*. Every carve-out release PR (e.g. #2857) went red, and release-bugfix.yml's fail-closed full-CI gate then blocked the merge-time publish. --- .github/workflows/ci.yml | 4 ++-- reference/release.md | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a23023f59e..30fa5a7b39 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -79,8 +79,8 @@ jobs: run: | set -euo pipefail BRANCH="${GITHUB_HEAD_REF}" - # Release branches are allowed to bump version. - if [[ "$BRANCH" == *_release-v* ]]; then + # Release + bugfix carve-out branches (#2851/#2853) may bump version — one isolated 'release v{VERSION}' commit each. + if [[ "$BRANCH" == *_release-v* || "$BRANCH" == bugfix-release/* ]]; then echo "✓ release branch ($BRANCH) — version changes allowed" exit 0 fi diff --git a/reference/release.md b/reference/release.md index b4d5c82314..965662a867 100644 --- a/reference/release.md +++ b/reference/release.md @@ -170,6 +170,12 @@ nothing else. such a branch no longer auto-publishes (#2851 removed the silent-push path). It is what `release.yml`'s detection deliberately does NOT match, so merging the PR cannot double-publish the post-merge master through the normal channel. + Guard-compatibility requirement: the ci.yml `version-guard` MUST whitelist this + prefix in parallel with `*_release-v*` — a carve-out PR legally carries exactly + one isolated release-bump commit. #2858 was exactly this divergence: #2853 + updated release-bugfix.yml / AGENTS.md / this doc but not ci.yml, so every + carve-out PR went red on version-guard and the fail-closed full-CI gate blocked + every merge-time publish until the guard was fixed on master. 2. **Human reviews and merges the PR** — the same review gate as a normal release PR. While it is open, the standard lane set already runs on the head sha (path-filtered `pull_request` triggers), which the publish gate reuses.