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

Add build docs script #1873

Merged
merged 1 commit into from
Jun 16, 2016
Merged

Add build docs script #1873

merged 1 commit into from
Jun 16, 2016

Conversation

ruflin
Copy link
Collaborator

@ruflin ruflin commented Jun 16, 2016

Building the docs is now part of make testsuite

Building of the generators was also added to the testsuite.

@ruflin ruflin added review needs_backport PR is waiting to be backported to other branches. labels Jun 16, 2016
@ruflin
Copy link
Collaborator Author

ruflin commented Jun 16, 2016

@dedemorton This means in the future you can just run make docs-preview instead of assembling the command yourself ...

@ruflin ruflin force-pushed the automate-docs branch 2 times, most recently from dd3a95f to 78e2ac1 Compare June 16, 2016 12:36
@ruflin
Copy link
Collaborator Author

ruflin commented Jun 16, 2016

@andrewkroh I removed the doc build in Jenkins to replace it by this PR. Should we backport this to 1.3, at least the overall docs build?

.PHONY: testsuite
testsuite:
$(foreach var,$(PROJECTS),$(MAKE) -C $(var) testsuite || exit 1;)
#$(MAKE) -C generate test
$(MAKE) docs
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would prefer to not have the docs build tied to testsuite. I would rather be able to specify if I want them both to run like make testsuite docs.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I kept it in to not have to change the jenkins command and it is currently incompatible with 1.3. but I will just update 1.3 very soon, so this is not a problem. I removed it.

@andrewkroh
Copy link
Member

Yeah, it would be good to backport at least the make docs part of this.

To build the docs, `make docs` can be used. To preview the docs, `make docs-preview` can be used.

* Building the docs is now part of make testsuite
* Make local docs build and preview easy by adding it to the makefile
* Update CONTRIBUTING.md with new commands

The generators are currently not part of the build as they require glide to be installed.
ruflin added a commit to ruflin/beats that referenced this pull request Jun 16, 2016
@ruflin ruflin mentioned this pull request Jun 16, 2016
@andrewkroh andrewkroh merged commit bcc9866 into elastic:master Jun 16, 2016
andrewkroh pushed a commit that referenced this pull request Jun 16, 2016
@ruflin ruflin removed the needs_backport PR is waiting to be backported to other branches. label Dec 20, 2016
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants