Add a warning for uncommitted changes in copy-vendor, and quiet git c…

…ommit (elastic#13381) * Add a warning for uncommitted changes, add quiet to git commit
faec · Aug 29, 2019 · 4ef2e07 · 4ef2e07
1 parent eb5a3d7
commit 4ef2e07
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/generator/beat/{beat}/Makefile b/generator/beat/{beat}/Makefile
@@ -24,7 +24,7 @@ pre-setup: copy-vendor git-init
 
 # Copy beats into vendor directory
 .PHONY: copy-vendor
-copy-vendor:
+copy-vendor: vendor-check
 	mkdir -p vendor/github.com/elastic/beats
 	git archive --remote ${BEAT_GOPATH}/src/github.com/elastic/beats HEAD | tar -x --exclude=x-pack -C vendor/github.com/elastic/beats
 	mkdir -p vendor/github.com/magefile
@@ -37,4 +37,9 @@ git-init:
 .PHONY: git-add
 git-add:
 	git add -A
-	git commit -m "Add generated {beat} files"
+	git commit -q -m "Add generated {beat} files"
+
+
+.PHONY: vendor-check
+vendor-check:
+	@if output=$$(git -C ${BEAT_GOPATH}/src/github.com/elastic/beats status --porcelain) && [ ! -z "$${output}" ]; then printf "\033[31mWARNING: elastic/beats has uncommitted changes, these will not be in the vendor directory!\033[0m\n"; fi
diff --git a/generator/metricbeat/{beat}/Makefile b/generator/metricbeat/{beat}/Makefile
@@ -21,7 +21,7 @@ setup: copy-vendor git-init
 
 # Copy beats into vendor directory
 .PHONY: copy-vendor
-copy-vendor:
+copy-vendor: vendor-check
 	mkdir -p vendor/github.com/elastic/beats
 	git archive --remote ${BEAT_GOPATH}/src/github.com/elastic/beats HEAD | tar -x --exclude=x-pack -C vendor/github.com/elastic/beats
 	ln -sf ${PWD}/vendor/github.com/elastic/beats/metricbeat/scripts/generate_imports_helper.py ${PWD}/vendor/github.com/elastic/beats/script/generate_imports_helper.py
@@ -36,4 +36,8 @@ git-init:
 .PHONY: git-add
 git-add:
 	git add -A
-	git commit -m "Add generated {beat} files"
+	git commit -q -m "Add generated {beat} files"
+
+.PHONY: vendor-check
+vendor-check:
+	@if output=$$(git -C ${BEAT_GOPATH}/src/github.com/elastic/beats status --porcelain) && [ ! -z "$${output}" ]; then printf "\033[31mWARNING: elastic/beats has uncommitted changes, these will not be in the vendor directory!\033[0m\n"; fi