Update golangci-lint (#4636)
Update golangci-lint to latest version. Remove ci-lint, no longer used. Remove golangci-lint from tools target to prevent CI builds from downloading automatically (and unnecessarily). Developers can still run make golangci-lint to download it locally for development and testing purposes.
This commit is contained in:
parent
3a39e9d558
commit
a57915600c
3
Makefile
3
Makefile
|
@ -145,8 +145,7 @@ test_sim_app_profile:
|
||||||
test_cover:
|
test_cover:
|
||||||
@export VERSION=$(VERSION); bash -x tests/test_cover.sh
|
@export VERSION=$(VERSION); bash -x tests/test_cover.sh
|
||||||
|
|
||||||
lint: tools ci-lint
|
lint: golangci-lint
|
||||||
ci-lint:
|
|
||||||
golangci-lint run
|
golangci-lint run
|
||||||
find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" | xargs gofmt -d -s
|
find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" | xargs gofmt -d -s
|
||||||
go mod verify
|
go mod verify
|
||||||
|
|
|
@ -17,8 +17,8 @@ endif
|
||||||
|
|
||||||
GOPATH ?= $(shell $(GO) env GOPATH)
|
GOPATH ?= $(shell $(GO) env GOPATH)
|
||||||
GITHUBDIR := $(GOPATH)$(FS)src$(FS)github.com
|
GITHUBDIR := $(GOPATH)$(FS)src$(FS)github.com
|
||||||
GOLANGCI_LINT_VERSION := v1.16.0
|
GOLANGCI_LINT_VERSION := v1.17.1
|
||||||
GOLANGCI_LINT_HASHSUM := ac897cadc180bf0c1a4bf27776c410debad27205b22856b861d41d39d06509cf
|
GOLANGCI_LINT_HASHSUM := f5fa647a12f658924d9f7d6b9628d505ab118e8e049e43272de6526053ebe08d
|
||||||
|
|
||||||
###
|
###
|
||||||
# Functions
|
# Functions
|
||||||
|
@ -52,7 +52,7 @@ CLOG = $(TOOLS_DESTDIR)/clog
|
||||||
all: tools
|
all: tools
|
||||||
|
|
||||||
tools: tools-stamp
|
tools: tools-stamp
|
||||||
tools-stamp: $(STATIK) $(GOIMPORTS) $(CLOG) $(GOLANGCI_LINT)
|
tools-stamp: $(STATIK) $(GOIMPORTS) $(CLOG)
|
||||||
touch $@
|
touch $@
|
||||||
|
|
||||||
$(GOLANGCI_LINT): $(mkfile_dir)/install-golangci-lint.sh
|
$(GOLANGCI_LINT): $(mkfile_dir)/install-golangci-lint.sh
|
||||||
|
@ -62,11 +62,13 @@ $(STATIK):
|
||||||
$(call go_install,rakyll,statik,v0.1.5)
|
$(call go_install,rakyll,statik,v0.1.5)
|
||||||
|
|
||||||
$(GOIMPORTS):
|
$(GOIMPORTS):
|
||||||
go get golang.org/x/tools/cmd/goimports@v0.0.0-20190114222345-bf090417da8b
|
go get golang.org/x/tools/cmd/goimports@v0.0.0-20190628034336-212fb13d595e
|
||||||
|
|
||||||
$(CLOG):
|
$(CLOG):
|
||||||
$(call go_install,alessio,clog,1)
|
$(call go_install,alessio,clog,1)
|
||||||
|
|
||||||
|
golangci-lint: $(GOLANGCI_LINT)
|
||||||
|
|
||||||
tools-clean:
|
tools-clean:
|
||||||
rm -f $(STATIK) $(GOIMPORTS) $(CLOG) $(GOLANGCI_LINT)
|
rm -f $(STATIK) $(GOIMPORTS) $(CLOG) $(GOLANGCI_LINT)
|
||||||
rm -f tools-stamp
|
rm -f tools-stamp
|
||||||
|
|
Loading…
Reference in New Issue