Skip to content

ci: fix release baseline (select by tag name, not reachability) [bump:patch]#15

Merged
julian-goldstein merged 1 commit into
masterfrom
fix-baseline-scoping
Jun 19, 2026
Merged

ci: fix release baseline (select by tag name, not reachability) [bump:patch]#15
julian-goldstein merged 1 commit into
masterfrom
fix-baseline-scoping

Conversation

@julian-goldstein

Copy link
Copy Markdown
Contributor

Regression

The --merged HEAD baseline filter (added for back-patch scoping) is incompatible with how vendor tags releases: it commits the lock and pushes only the tag (master is protected), so every release tag points to a detached commit that's on no branch's ancestry.

Result on master: git tag --merged HEAD saw only v0.1 → baseline collapsed to 0.1 → it cut a bogus v0.2.0.

Fix

Select the baseline by tag name, not git reachability:

  • release/vX.Y (or release/vX.Y.Z) → restrict to that X.Y line (vX.Y, vX.Y.Z)
  • master / any other ref → all clean tags globally (highest by sort -V)

Keeps back-patch isolation, restores correct mainline bumping, and works with detached tags. Flavor/suffixed tags remain excluded. Verified against representative tag sets (master, release lines, flavor + toolchain exclusions).

Note

Touches vendor.yml → merging triggers a release. After the tag cleanup (baseline back to v0.5), this merge cuts the corrected v0.6.0.

…atch]

The --merged HEAD filter was wrong: vendor publishes each release by committing
the lock + pushing ONLY the tag (master is protected), so release tags point at
detached commits that are never on any branch's ancestry. On master --merged
saw only v0.1, collapsing the baseline and cutting a bogus v0.2.0.

Select the baseline by tag NAME instead: a release/vX.Y branch restricts to its
X.Y line (vX.Y, vX.Y.Z), master/other refs use all clean tags globally. This
restores correct mainline bumping and keeps back-patch isolation, both
compatible with detached release tags. Flavor/suffixed tags stay excluded.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
@julian-goldstein julian-goldstein added this pull request to the merge queue Jun 19, 2026
Merged via the queue into master with commit ce93839 Jun 19, 2026
1 check passed
@julian-goldstein julian-goldstein deleted the fix-baseline-scoping branch June 19, 2026 18:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant