iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change to the vet built-in because cmd/vet is no longer available

This commit is contained in:
Chris Bednarski 2016-04-07 16:34:54 -07:00
parent b199a6e546
commit e9d0c8980c
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -1,4 +1,5 @@
TEST?=$(shell go list ./... | grep -v vendor) TEST?=$(shell go list ./... | grep -v vendor)
VET?=$(shell ls -d */ | grep -v vendor | grep -v website)
# Get the current full sha from git # Get the current full sha from git
GITSHA:=$(shell git rev-parse HEAD) GITSHA:=$(shell git rev-parse HEAD)
# Get the current local branch name from git (if we can, this may be blank) # Get the current local branch name from git (if we can, this may be blank)
@ -28,7 +29,6 @@ package:
deps: deps:
go get github.com/mitchellh/gox go get github.com/mitchellh/gox
go get golang.org/x/tools/cmd/stringer go get golang.org/x/tools/cmd/stringer
go get golang.org/x/tools/cmd/vet
@go version | grep 1.4 ; if [ $$? -eq 0 ]; then \ @go version | grep 1.4 ; if [ $$? -eq 0 ]; then \
echo "Installing godep and restoring dependencies"; \ echo "Installing godep and restoring dependencies"; \
go get github.com/tools/godep; \ go get github.com/tools/godep; \
@ -57,7 +57,7 @@ generate: deps
test: deps test: deps
@go test $(TEST) $(TESTARGS) -timeout=30s @go test $(TEST) $(TESTARGS) -timeout=30s
@go vet $(TEST) ; if [ $$? -eq 1 ]; then \ @go tool vet $(VET) ; if [ $$? -eq 1 ]; then \
echo "ERROR: Vet found problems in the code."; \ echo "ERROR: Vet found problems in the code."; \
exit 1; \ exit 1; \
fi fi
@ -73,7 +73,6 @@ testrace: deps
updatedeps: updatedeps:
go get -u github.com/mitchellh/gox go get -u github.com/mitchellh/gox
go get -u golang.org/x/tools/cmd/stringer go get -u golang.org/x/tools/cmd/stringer
go get -u golang.org/x/tools/cmd/vet
@echo "INFO: Packer deps are managed by godep. See CONTRIBUTING.md" @echo "INFO: Packer deps are managed by godep. See CONTRIBUTING.md"
# This is used to add new dependencies to packer. If you are submitting a PR # This is used to add new dependencies to packer. If you are submitting a PR