Skip to content

[PR] ci(release): ship-time audit — flag backport-labeled PRs missing from the train (#4474) - #4475

Merged
ranxianglei merged 1 commit into
masterfrom
2026-10-24_ship-audit
Oct 24, 2026
Merged

ranxianglei merged 1 commit into
masterfrom
2026-10-24_ship-audit

Conversation

@ranxianglei

Copy link
Copy Markdown
Owner

Fixes #4474.

The gap (owner-spotted in-session): a backport cherry-pick conflict leaves only a PR comment. Ship-time CI validates the train TREE is green — never that every backport-labeled fix actually MADE IT onto the train. So a patch release could silently ship without a fix the owner labeled for it.

The fix: a reconciliation step in the one-click train flow (release-manual.yml), running just before the ship PR opens:

  1. enumerate every backport-labeled merge to master since the train's base tag — both merge-commit merges (Merge pull request #N) via their M^1..M^2 ranges AND squash-shape subjects ending (#N);
  2. check each own-commit against the cherry-pick -x trailers on the train (cherry picked from commit <sha>);
  3. any no-show renders as a prominent ⚠️ section at the TOP of the ship PR body, listing PR numbers + titles and the manual pick command.

Never fails the run — the owner may legitimately ship without the straggler (e.g. #4473, a CI-only change that cannot ride a tag-based train), but it becomes impossible to MISS at the single human decision point.

Verification (live repo, both directions):

YAML parses (20 steps), audit run block passes bash -n, and the shell logic executed verbatim against real refs + real PR labels.

reference/release.md documents the audit in the dual-lane ship step.$(printf '

')

… the train (#4474)

A conflicted backport leaves only a PR comment; CI green on the train
head says nothing about fixes that are ABSENT. Before opening the ship
PR, reconcile every backport-labeled merge since the train's base tag
(merge-commit ranges + squash-shape subjects) against the cherry-pick
-x trailers on the train; any no-show renders as a prominent warning
section at the top of the ship PR body. Never fails the run — the owner
may ship without the straggler, but must see it first.

Verified end-to-end against the live repo: stale train (missing the
#4470 pick) -> flags {#4473, #4470}; real train (pick present) -> flags
{#4473} only, both directions.
@github-actions

Copy link
Copy Markdown
Contributor

📦 Built Package Artifact

Branch: 2026-10-24_ship-audit (7075bb5)

Latest build — install this exact version

npm install -g billion-context@0.0.5376-pr.4475.4d05ac1

This exact version is immutable and reproducible. The rolling pr tag tracks the newest test build across all PRs.

Recent builds (commit → version)

commit version build
7075bb5 billion-context@0.0.5376-pr.4475.4d05ac1 build

Download artifact

  1. Download the artifact from the Actions run
  2. Extract the tarball and install:
tar xzf billion-context-pr4475.tgz
npm install -g package

Install instructions are refreshed on each push.

@ranxianglei ranxianglei added the backport merge onto the patch train (bugfix-release/**) via the backport bot — set BEFORE merging label Oct 24, 2026
@ranxianglei
ranxianglei merged commit 2d51e5d into master Oct 24, 2026
66 checks passed
@github-actions

Copy link
Copy Markdown
Contributor

📦 Merged Build Published

This merge to master was published as 0.0.785-master.2d51e5d (rolling master tag).

npm install -g billion-context@0.0.785-master.2d51e5d  # this exact build
npm install -g billion-context@master  # always the newest merged build

npm view billion-context@master prints the current version at any time.

@github-actions

Copy link
Copy Markdown
Contributor

Backport to bugfix-release/v0.1.206-train did not complete — either the cherry-pick conflicts (the fix is NOT independent of master's unreleased work), the run is a duplicate rerun, the train branch is stale/misconfigured, or the CI dispatch failed AFTER a successful push (check the train log before retrying anything — see the job log). The fix stays on the master (slow) lane either way. To force it onto the train, resolve manually: git checkout bugfix-release/v0.1.206-train && git cherry-pick -x $(git rev-list --reverse --no-merges 2d51e5d259c7629f7c511f70e86de4d7e798c681^1..2d51e5d259c7629f7c511f70e86de4d7e798c681^2).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

1 participant