Skip to content

don't suppress mage -clean errors any more #9854

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

Merged
graphaelli merged 1 commit into from
Jan 3, 2019
Merged

don't suppress mage -clean errors any more #9854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ clean:
@rm -rf build
@$(foreach var,$(PROJECTS) $(PROJECTS_XPACK_MAGE),$(MAKE) -C $(var) clean || exit 1;)
@$(MAKE) -C generator clean
@-mage -clean 2> /dev/null
@-mage -clean

# Cleans up the vendor directory from unnecessary files
# This should always be run after updating the dependencies
Expand Down
2 changes: 1 addition & 1 deletion dev-tools/make/mage.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ mage:
ifndef MAGE_PRESENT
@echo Installing mage $(MAGE_VERSION) from vendor dir.
@go install -ldflags="-X $(MAGE_IMPORT_PATH)/mage.gitTag=$(MAGE_VERSION)" ${MAGE_IMPORT_PATH}
@-mage -clean 2> /dev/null || true
@-mage -clean
endif
@true
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 @@ -160,7 +160,7 @@ clean:: ## @build Cleans up all files generated by the build steps
@rm -f _meta/fields.generated.yml fields.yml
@rm -rf $(PWD)/_meta/kibana.generated
@rm -f ${BEAT_NAME}.template*.json
@-mage -clean 2> /dev/null || true
@-mage -clean

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