Repository navigation
[PR] feat(ci): patch cycles with dual-PR forwarding — replaces the patch train - #4478
Closed
ranxianglei wants to merge 3 commits into
Closed
ranxianglei wants to merge 3 commits into
ranxianglei wants to merge 3 commits into
Conversation
Contributor
📦 Built Package ArtifactBranch: Latest build — install this exact versionnpm install -g billion-context@0.0.5396-pr.4478.edff548This exact version is immutable and reproducible. The rolling Recent builds (commit → version)
Download artifact
tar xzf billion-context-pr4478.tgz
npm install -g packageInstall instructions are refreshed on each push. |
ranxianglei
force-pushed
the
2026-10-24_fixed-bugfix-dual-pr
branch
from
October 24, 2026 03:50
18bfd61 to
1f64dd9
Compare
This was referenced Oct 24, 2026
added 2 commits
October 24, 2026 13:30
…ease gets its own patch/v<tag> branch with auto recut-replay (#4477)
ranxianglei
force-pushed
the
2026-10-24_fixed-bugfix-dual-pr
branch
from
October 24, 2026 05:30
ffd11fa to
5305d8c
Compare
…tripwire red since #4481 merge)
Owner
Author
|
不是我要的 关闭 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #4477
这是啥问题?
补丁火车(backport 标签+机器人 cherry-pick,#4468 上线)有发车盲区(#4474)、车名每版一换要跟变量、机器人事故面大(#4471 403)。owner 决策链(m02229→m03016):每个修复 PR 一次性开两个(修复 PR + master twin,后者机器人自动开);分支形态从「固定 bugfix」演进为每次发版自动生成新分支——
patch/v<最新已发布 tag>,名即基底。模型(最终形态)
改动(head 树 vs master)
.github/workflows/fix-dual-pr.yml(新,~260 行)patch/v*的 PR opened/synchronize/reopened → cherry-pick 其 commit 到 master 头 → 推twin/<fix-branch>→ 开/更新 twin PR + dispatch CI(#772)+ 回评链接;closed 未合→关 twin 删分支;目标分支早于最新 tag→PR 评论过时警告(recut-replay 会救);>20 commit=master 基底拒绝.github/workflows/patch-leak-guard.yml(新,~50 行)patch/v*:merge commit 第二亲本是 origin/master 祖先 →::error(防 master→cycle 泄漏未发内容);twin 合并带回的是 re-pick 不同 SHA,不误报.github/workflows/backport.yml.github/workflows/ci.ymlpatch/v*;plan job:twin/*早退→core(ci:full 标签优先可加宽);version-guard:base=patch/v*时 diff 基准改该 cycle,allowlist +=patch/v*(ship PR 头).github/workflows/release-manual.ymltrain→bugfix(名字保留,语义=发当前周期):Resolve 步=找 live cycle,不存在/mid-cycle 超越则自动 recut-replay;bump→push 到 cycle→ship PR(base=master)→dispatch 全量;audit 步用git cherry -v把「车上未上 master 的修复」渲染进 ship PR.github/workflows/release-bugfix.ymlpatch/v*(车道 ship PR)+ legacybugfix-release/*(单发急修兜底);closeout 新增:发布后立即从新 tag 切下一周期分支,owner 永远有现成靶子reference/release.md|
scripts/live-files.mjs| 补登记 #4449 漏登的两个 process-spawning 测试(见上段) ||
AGENTS.md§4/§5 | release 分支清单 + carve-out 指针句更新 |第三 commit(小问题直接修):rebase 到含 v0.1.206 的 master 后,CI 全部 test lane 被 #1248 tripwire 拦下——#4449(codex 桌面插件)落地时把两个 process-spawning 测试(
tests/codex-mcp-shell.test.ts、tests/codex-plugin-version-sync.test.ts)漏登记进LIVE_FILES。已按 gate 要求先审并发假设:mcp-shell 只 spawn 一个 stub entry 子进程、无任何 listener;version-sync 全execFileSync(同步)。两者都不占真实端口,追加到表尾(slot=index)即安全;本地用同一SPAWN_RE复算 tripwire 通过(剩余未登记=空)。与固定分支版的差异(为什么演进)
每次 patch 发布都必然换基底——per-cycle 把这个移动做成机制保证(closeout 自动切新分支)而不是手动仪式(固定分支靠 drift guard 红灯提醒 owner 手动重切),且分支名自带基底版本(
patch/v0.1.205不用查 npm 就知道基础);mid-cycle 的 master 发版由 recut-replay 自动消化,不再依赖人工判断时机。自审过的边界
ci:fulllabel has a merge-timing race condition (v0.1.200's | 发版 PR 应默认跑全量矩阵:ci:full 标签存在合并时序竞态(v0.1.200 全量被取消后白付两遍) #3688 误升 FULL);patch/v*,bot-authored)的 CI 由 fallback dispatch 全量覆盖;version-guard 对patch/v*头放行(bump 即 release commit);测试
yaml.safe_load全过、全部 66 个 run 块bash -n过;patch/v0.1.206(已核实:旧火车的两个待发修复都已在 v0.1.206 里——以不同 SHA 的 patch-equivalent commit 合入 master 后随正常发版发布——零重放)、删bugfix-release/v0.1.206-train、ruleset 保护patch/*(禁强推/删)、required checks 镜像 master、删BACKPORT_TRAIN变量(若仍在)。取代关系
human-only merge(CI 编排类,§7.4)。