Skip to content

Fix Antora yaml generation such that release branches have the right version#835

Merged
HoustonPutman merged 1 commit into
apache:mainfrom
HoustonPutman:antora-yaml-tooling
Jun 9, 2026
Merged

Fix Antora yaml generation such that release branches have the right version#835
HoustonPutman merged 1 commit into
apache:mainfrom
HoustonPutman:antora-yaml-tooling

Conversation

@HoustonPutman

Copy link
Copy Markdown
Contributor

Follow up from #834

The committed docs/antora.yml is what the published Reference Guide uses for a branch, so it must reflect that branch's released version (not a prerelease) and should only change at release time. Previously make docs and propagate_version.sh regenerated it from version/version.go on every run, leaving release branches showing a prerelease version.

Mirror Solr's approach:

  • make docs/check-docs now stage a build dir (docs/build/staging) with a throwaway antora.yml generated from version/version.go, so local previews show the in-development version without touching the committed file.
  • generate_antora_yaml.sh takes -o (output) for staging.
  • Remove antora.yml regeneration from propagate_version.sh; the release wizard regenerates the committed docs/antora.yml at release (after the prerelease suffix is stripped), so it reflects the released version.

…aged

Follow up from apache#834

The committed docs/antora.yml is what the published Reference Guide uses for
a branch, so it must reflect that branch's released version (not a prerelease)
and should only change at release time. Previously `make docs` and
propagate_version.sh regenerated it from version/version.go on every run,
leaving release branches showing a prerelease version.

Mirror Solr's approach:
- `make docs`/`check-docs` now stage a build dir (docs/build/staging) with a
  throwaway antora.yml generated from version/version.go, so local previews
  show the in-development version without touching the committed file.
- generate_antora_yaml.sh takes -o (output) for staging.
- Remove antora.yml regeneration from propagate_version.sh; the release wizard
  regenerates the committed docs/antora.yml at release (after the prerelease
  suffix is stripped), so it reflects the released version.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@HoustonPutman HoustonPutman added the documentation Improvements or additions to documentation label Jun 9, 2026
@HoustonPutman HoustonPutman merged commit ef3821b into apache:main Jun 9, 2026
3 checks passed
@HoustonPutman HoustonPutman deleted the antora-yaml-tooling branch June 9, 2026 20:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

documentation Improvements or additions to documentation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant