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.

Sign up for GitHub

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

libbeat/scripts: make testsuite target re-runnable #3925

Merged
merged 2 commits into from
Apr 6, 2017
Merged

libbeat/scripts: make testsuite target re-runnable #3925

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75f9f23
libbeat/scripts: make testsuite target re-runnable
Apr 5, 2017
80ea152
Restore testsuite dependencies: we do not support running in parallel
Apr 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libbeat/scripts/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ clean:: ## @build Cleans up all files generated by the build steps
# Clean index pattern
rm -f $(PWD)/_meta/kibana/index-pattern/${BEAT_NAME}.json
# Remove temp templates
-rm ${BEAT_NAME}.template*.json
Copy link
Contributor

Choose a reason for hiding this comment

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

This should not be needed anymore on master as no templates are generated anymore. All are loaded dynamically from fields.yml.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ok I'll remove it completely

Copy link
Contributor

Choose a reason for hiding this comment

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

I should have been more accurate here. It is still possible to generate the template through make index-template so removing can be still needed. But it (should) have no effect on the build as it is not used.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

👍 I'll keep it

-rm -f ${BEAT_NAME}.template*.json

.PHONY: ci
ci: ## @build Shortcut for continuous integration. This should always run before merging.
Expand Down