diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2020-07-04 11:12:55 +0200 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2020-07-04 15:05:30 +0200 |
| commit | c7d7f10bdff703e4a3c0414e8a33d4e45c91eb35 (patch) | |
| tree | 0dff0ee1f98dbfa3ad8776112053a450d176592b /Makefile | |
| parent | 9573094ce235bd9afe88f5da27a47dd6bcc1e13b (diff) | |
go.mod: vendor golangci-lint
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 3 insertions, 7 deletions
@@ -50,6 +50,7 @@ CGO_ENABLED ?= 0 export CGO_ENABLED TARGETGOOS := $(TARGETOS) TARGETGOARCH := $(TARGETVMARCH) +export GO111MODULE=on GITREV=$(shell git rev-parse HEAD) ifeq ("$(shell git diff --shortstat)", "") @@ -258,6 +259,8 @@ tidy: executor/*.cc lint: + # This should install the command from our vendor dir. + go install github.com/golangci/golangci-lint/cmd/golangci-lint golangci-lint run ./... arch_darwin_amd64_host: @@ -400,13 +403,6 @@ install_prerequisites: sudo apt-get install -y -q ragel clang-format go get -u golang.org/x/tools/cmd/goyacc \ github.com/dvyukov/go-fuzz/go-fuzz-build - # Runs golangci-lint when go is new enough. Old versions get a - # free pass (except on CI which has newer go version). - if [ "$$(go version)" \> "go version go1.12" ]; then \ - GO111MODULE=on go get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.25.0 ; \ - else \ - ln -sf /bin/true $$(go env GOPATH)/bin/golangci-lint ; \ - fi check_copyright: ./tools/check-copyright.sh |