From 592e055f12b2de16ee1ae0ed9fe7a7b6fe2a663e Mon Sep 17 00:00:00 2001 From: Cameron Moore Date: Wed, 19 Apr 2017 08:05:20 -0500 Subject: [PATCH] Add check-vendor target to Makefile The check-vendor target will exit with an error if any files in vendor/ differ from what's checked into git. govendor checksums can get out of sync if extraneous files are in the local, third-party repo (see kardianos/govendor#129). govendor also updates the vendor.json upon "sync." We can use that quirk to detect out of sync checksums in CI, so I've added check-vendor to the check target dependencies. --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a361ca828..9769e28a2 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,7 @@ gitinfo: hugo # Deprecated: use "hugo" target install-gitinfo: install # Deprecated: use "install" target no-git-info: hugo-no-gitinfo # Deprecated: use "hugo-no-gitinfo" target -check: test-race test386 fmt vet ## Run tests and linters +check: test-race test386 fmt vet check-vendor ## Run tests and linters test386: ## Run tests in 32-bit mode GOARCH=386 govendor test +local @@ -76,5 +76,8 @@ test-cover-html: ## Generate test coverage report tail -n +2 coverage.out >> coverage-all.out;) go tool cover -html=coverage-all.out +check-vendor: ## Verify that vendored packages match git HEAD + @git diff-index --quiet HEAD || echo "check-vendor target failed: vendored packages out of sync" && echo && git diff vendor/ && exit 1 + help: @grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'