Skip to content

Commit

Permalink
Update golangci-lint (cosmos#4636)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Alessio Treglia authored Jun 28, 2019
1 parent 3a39e9d commit a579156
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,7 @@ test_sim_app_profile:
test_cover:
@export VERSION=$(VERSION); bash -x tests/test_cover.sh

lint: tools ci-lint
ci-lint:
lint: golangci-lint
golangci-lint run
find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" | xargs gofmt -d -s
go mod verify
Expand Down
10 changes: 6 additions & 4 deletions contrib/devtools/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ endif

GOPATH ?= $(shell $(GO) env GOPATH)
GITHUBDIR := $(GOPATH)$(FS)src$(FS)github.com
GOLANGCI_LINT_VERSION := v1.16.0
GOLANGCI_LINT_HASHSUM := ac897cadc180bf0c1a4bf27776c410debad27205b22856b861d41d39d06509cf
GOLANGCI_LINT_VERSION := v1.17.1
GOLANGCI_LINT_HASHSUM := f5fa647a12f658924d9f7d6b9628d505ab118e8e049e43272de6526053ebe08d

###
# Functions
Expand Down Expand Up @@ -52,7 +52,7 @@ CLOG = $(TOOLS_DESTDIR)/clog
all: tools

tools: tools-stamp
tools-stamp: $(STATIK) $(GOIMPORTS) $(CLOG) $(GOLANGCI_LINT)
tools-stamp: $(STATIK) $(GOIMPORTS) $(CLOG)
touch $@

$(GOLANGCI_LINT): $(mkfile_dir)/install-golangci-lint.sh
Expand All @@ -62,11 +62,13 @@ $(STATIK):
$(call go_install,rakyll,statik,v0.1.5)

$(GOIMPORTS):
go get golang.org/x/tools/cmd/[email protected]20190114222345-bf090417da8b
go get golang.org/x/tools/cmd/[email protected]20190628034336-212fb13d595e

$(CLOG):
$(call go_install,alessio,clog,1)

golangci-lint: $(GOLANGCI_LINT)

tools-clean:
rm -f $(STATIK) $(GOIMPORTS) $(CLOG) $(GOLANGCI_LINT)
rm -f tools-stamp
Expand Down

0 comments on commit a579156

Please sign in to comment.