From b7f5b0ab3c9b1af9397c557e410473119399f8b6 Mon Sep 17 00:00:00 2001 From: "Joe Richey joerichey@google.com" Date: Thu, 30 Aug 2018 02:19:59 -0700 Subject: [PATCH] Don't vendor helper tooling --- Makefile | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 62f519f..a1fa42a 100644 --- a/Makefile +++ b/Makefile @@ -166,18 +166,21 @@ TOOLS := $(addprefix $(BIN)/,protoc golint protoc-gen-go goimports megacheck goc .PHONY: tools tools: $(TOOLS) -# Go tools build from vendored sources -VENDOR := $(shell find vendor -type f) -$(BIN)/golint: $(VENDOR) - go build -o $@ ./vendor/github.com/golang/lint/golint -$(BIN)/protoc-gen-go: $(VENDOR) - go build -o $@ ./vendor/github.com/golang/protobuf/protoc-gen-go -$(BIN)/goimports: $(VENDOR) - go build -o $@ ./vendor/golang.org/x/tools/cmd/goimports -$(BIN)/megacheck: $(VENDOR) - go build -o $@ ./vendor/honnef.co/go/tools/cmd/megacheck -$(BIN)/gocovmerge: $(VENDOR) - go build -o $@ ./vendor/github.com/wadey/gocovmerge +$(BIN)/golint: + GO111MODULE=off go get github.com/golang/lint/golint + GO111MODULE=off go build -o $@ github.com/golang/lint/golint +$(BIN)/protoc-gen-go: + GO111MODULE=off go get github.com/golang/protobuf/protoc-gen-go + GO111MODULE=off go build -o $@ github.com/golang/protobuf/protoc-gen-go +$(BIN)/goimports: + GO111MODULE=off go get golang.org/x/tools/cmd/goimports + GO111MODULE=off go build -o $@ golang.org/x/tools/cmd/goimports +$(BIN)/megacheck: + GO111MODULE=off go get honnef.co/go/tools/cmd/megacheck + GO111MODULE=off go build -o $@ honnef.co/go/tools/cmd/megacheck +$(BIN)/gocovmerge: + GO111MODULE=off go get github.com/wadey/gocovmerge + GO111MODULE=off go build -o $@ github.com/wadey/gocovmerge # Non-go tools downloaded from appropriate repository PROTOC_VERSION := 3.5.1 -- 2.39.5