Skip to content

Commit

Permalink
don't suppress mage -clean errors any more (#9854)
Browse files Browse the repository at this point in the history
now that missing cache dirs don't cause an error
  • Loading branch information
graphaelli committed Jan 3, 2019
1 parent 42421e9 commit c908638
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Makefile
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
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
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

0 comments on commit c908638

Please sign in to comment.