Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unify doc version handling #1919

Merged
merged 2 commits into from
Jun 28, 2016
Merged

Conversation

tsg
Copy link
Contributor

@tsg tsg commented Jun 27, 2016

The new file libbeat/docs/version.asciidoc contains a single line with the
stack-version variable. All other version variables reference this one. This
makes it easy to automate version changing.

make update is needed to copy the file to the individual Beats. It would have
been possible to include directly the file from libbeat, but that would have had
a big disadvantage: the docs only get rebuild on file changes in the "book", so
changing the version in libbeat wouldn't trigger a docs rebuild on the public
website.

Also, it's kind of nice to have to run make update shortly before each release,
that makes it sure we won't forget.

@tsg tsg added the review label Jun 27, 2016
@tsg
Copy link
Contributor Author

tsg commented Jun 27, 2016

CC @dedemorton

@tsg tsg added the docs label Jun 27, 2016
@dedemorton
Copy link
Contributor

@tsg Great idea! But shouldn't we also have a variable for the branch so that we can set the paths too? So you would have a variable called something like doc-branch that sets the branch for each doc. For example:
:libbeat: http://www.elastic.co/guide/en/beats/libbeat/{doc-branch}.

Then in version.asciidoc, we would have:
:doc-branch: master

I'm just concerned that we might update the version without remembering to update the path. We use variables like {libbeat} in links between different books.

@tsg tsg changed the title Unify version handling Unify doc version handling Jun 28, 2016
Tudor Golubenco added 2 commits June 28, 2016 09:39
The new file `libbeat/docs/version.asciidoc` contains a single line with the
`stack-version` variable. All other version variables reference this one. This
makes it easy to automate version changing.

`make update` is needed to copy the file to the individual Beats. It would have
been possible to include directly the file from libbeat, but that would have had
a big disadvantage: the docs only get rebuild on file changes in the "book", so
changing the version in libbeat wouldn't trigger a docs rebuild on the public
website.

Also, it's kind of nice to have to run `make update` shortly before each release,
that makes it sure we won't forget.
@tsg tsg force-pushed the single_version_in_docs branch from 5d021fc to 4b80571 Compare June 28, 2016 07:41
@tsg
Copy link
Contributor Author

tsg commented Jun 28, 2016

@dedemorton ah, yes, we need that as well. I added it in a second commit. Can you have a look again, please?

@ruflin
Copy link
Contributor

ruflin commented Jun 28, 2016

+1 on this idea.

@dedemorton
Copy link
Contributor

LGTM. I did not pull the files and test the build, tho. I'll assume you did that. :-)

@dedemorton dedemorton merged commit c8c7a29 into elastic:master Jun 28, 2016
@tsg tsg deleted the single_version_in_docs branch August 25, 2016 10:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants