diff options
| author | Joseph Richey <joerichey@google.com> | 2018-02-08 02:01:29 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-08 02:01:29 -0800 |
| commit | f4ccce6f486c26fdfa8d3d09929d464fc9368ab3 (patch) | |
| tree | 82d72cbbc03b84e59d2018188f220340a95cff39 /Makefile | |
| parent | 141265fe9c7bc13bf8bff6265cfafc65ed2ebd5c (diff) | |
| parent | 78ec1b76d5dfd58bf244ee1426a6c86ed5fce118 (diff) | |
Merge pull request #83 from google/dep
Start using Dep
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 20 |
1 files changed, 6 insertions, 14 deletions
@@ -119,19 +119,11 @@ 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: - goimports -l -w $(GO_FILES) - clang-format -i -style=Google $(C_FILES) + @goreturns -l -w $(GO_FILES) + @clang-format -i -style=Google $(C_FILES) format-check: @goimports -d $(GO_FILES) \ @@ -169,8 +161,7 @@ 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 golang.org/x/tools/cmd/goimports + go get -u sourcegraph.com/sqs/goreturns go get -u honnef.co/go/tools/cmd/megacheck ##### Setup/Teardown for integration tests (need root permissions) ##### @@ -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 |