From 1a565266fcc3fe61d85db2cdb8662bed28be8fc0 Mon Sep 17 00:00:00 2001 From: Eric Chiang Date: Mon, 3 Dec 2018 10:01:18 -0800 Subject: [PATCH] Makefile: cleanups for newer versions of Go Go 1.9 removed "./..." matching the vendor directory while Go 1.10 added build and test caching. This means we no longer need to grep out vendored matches (except for golint which doesn't implement the same behavior), and we no longer need to pre-build packages with "go build -i". https://golang.org/doc/go1.9#vendor-dotdotdot https://golang.org/doc/go1.10#build --- Makefile | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 1b6bcf3c..3bfba339 100644 --- a/Makefile +++ b/Makefile @@ -39,23 +39,19 @@ revendor: @go mod verify test: - @go test -v -i $(shell go list ./... | grep -v '/vendor/') - @go test -v $(shell go list ./... | grep -v '/vendor/') + @go test -v ./... testrace: - @go test -v -i --race $(shell go list ./... | grep -v '/vendor/') - @go test -v --race $(shell go list ./... | grep -v '/vendor/') + @go test -v --race ./... vet: - @go vet $(shell go list ./... | grep -v '/vendor/') + @go vet ./... fmt: - @./scripts/gofmt $(shell go list ./... | grep -v '/vendor/') + @./scripts/gofmt ./... lint: bin/golint - @for package in $(shell go list ./... | grep -v '/vendor/' | grep -v '/api' | grep -v '/server/internal'); do \ - ./bin/golint -set_exit_status $$package $$i || exit 1; \ - done + @./bin/golint -set_exit_status $(shell go list ./...) .PHONY: docker-image docker-image: