aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJoseph Richey <joerichey94@google.com>2018-02-08 01:44:09 -0800
committerJoseph Richey <joerichey94@google.com>2018-02-08 01:54:06 -0800
commit78ec1b76d5dfd58bf244ee1426a6c86ed5fce118 (patch)
tree82d72cbbc03b84e59d2018188f220340a95cff39 /Makefile
parent04f027adbec863c1a8bc93d5f9ab08b36a420543 (diff)
dep: Update Travis to use dep
Add dep instalation, remove govendor from go tools, and add a check for dependancies.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile14
1 files changed, 3 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index 57c079e..56fbff0 100644
--- a/Makefile
+++ b/Makefile
@@ -119,14 +119,6 @@ test:
gen:
protoc --go_out=. $(PROTO_FILES)
-# Update the vendored dependencies.
-.PHONY: update
-update:
- govendor init
- govendor fetch +missing
- govendor add +external
- govendor remove +unused
-
# Format all the Go and C code
.PHONY: format format-check
format:
@@ -169,7 +161,6 @@ uninstall:
go-tools:
go get -u github.com/golang/protobuf/protoc-gen-go
go get -u github.com/golang/lint/golint
- go get -u github.com/kardianos/govendor
go get -u sourcegraph.com/sqs/goreturns
go get -u honnef.co/go/tools/cmd/megacheck
@@ -190,9 +181,10 @@ test-teardown:
##### Travis CI Commands
.PHONY: travis-setup travis-script
travis-install: go-tools test-setup
+ curl -L -s https://github.com/golang/dep/releases/download/v0.4.1/dep-linux-amd64 -o $(GOPATH)/bin/dep
+ chmod +x $(GOPATH)/bin/dep
go get -u github.com/mattn/goveralls
travis-script: lint format-check test default
goveralls -service=travis-ci
- @govendor list +missing +external +unused \
- | ./input_fail.py "Incorrect vendored dependencies. Run \"make update\"."
+ dep status