Skip to content

Keep the version stamp on the release tag when main refuses the push - #179

Merged
Bill Traynor (wmat) merged 1 commit into
mainfrom
version-bot-tag-stamped-commit
Oct 19, 2026
Merged

Bill Traynor (wmat) merged 1 commit into
mainfrom
version-bot-tag-stamped-commit

Conversation

@wmat

Copy link
Copy Markdown
Collaborator

The riscv organization ruleset requires signed commits and a passing DCO check on the default branch. version-bot.yml pushes its antora.yml stamp straight to main before tagging, and a bot's direct push satisfies neither, so the push is refused in every riscv repository. The bot then reset to main and tagged the unstamped commit: the tag's antora.yml named v0.0, scripts/build-pages-site.sh skipped it, and the release's versioned site path disappeared on the next push to main. Seen on riscv/riscv-memory-tagging v0.51.

On refusal, keep the stamp commit and tag it, pushing only the tag. The ruleset targets branches, so the tag lands and carries a descriptor naming its own version. build-pdf.yml's stamp-site-version PR still brings the stamp onto main.

Check for an existing tag before stamping, and accept one that is HEAD or the stamp commit on top of HEAD, so rerunning the bot for a version that is already tagged reuses the tag rather than failing on a fresh stamp commit.

Update MIGRATION.md (Steps 12-14) to match, including merging the stamp PR with Squash and merge, since its bot commit is unsigned.

The riscv organization ruleset requires signed commits and a passing DCO
check on the default branch. version-bot.yml pushes its antora.yml stamp
straight to main before tagging, and a bot's direct push satisfies
neither, so the push is refused in every riscv repository. The bot then
reset to main and tagged the unstamped commit: the tag's antora.yml named
v0.0, scripts/build-pages-site.sh skipped it, and the release's versioned
site path disappeared on the next push to main. Seen on
riscv/riscv-memory-tagging v0.51.

On refusal, keep the stamp commit and tag it, pushing only the tag. The
ruleset targets branches, so the tag lands and carries a descriptor naming
its own version. build-pdf.yml's stamp-site-version PR still brings the
stamp onto main.

Check for an existing tag before stamping, and accept one that is HEAD or
the stamp commit on top of HEAD, so rerunning the bot for a version that
is already tagged reuses the tag rather than failing on a fresh stamp
commit.

Update MIGRATION.md (Steps 12-14) to match, including merging the stamp
PR with Squash and merge, since its bot commit is unsigned.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Signed-off-by: Bill Traynor <wmat@riscv.org>
@wmat
Bill Traynor (wmat) merged commit bd83fa1 into main Oct 19, 2026
10 checks passed
Bill Traynor (wmat) added a commit that referenced this pull request Oct 19, 2026
Both sides added an entry at the top of CHANGELOG.md's [Unreleased]
section: this branch's bot-signing entry and #179's version-stamp
entry from main. Keep both. No other path conflicted; version-bot.yml
auto-merged and carries both this branch's App-token step and #179's
tag fallback.

Signed-off-by: Bill Traynor <wmat@riscv.org>
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