Skip to content

Commit

Permalink
Merge PR cosmos#5612: Makefile: remove golangci-lint installation
Browse files Browse the repository at this point in the history
  • Loading branch information
erikgrinaker authored Feb 4, 2020
1 parent e1517e7 commit 05e40d3
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 44 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,8 @@ benchmark:
### Linting ###
###############################################################################

lint: golangci-lint
$(BINDIR)/golangci-lint run
lint:
golangci-lint run
find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" | xargs gofmt -d -s
go mod verify
.PHONY: lint
Expand Down
11 changes: 2 additions & 9 deletions contrib/devtools/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.PHONY: all tools tools-clean statik runsim golangci-lint \
.PHONY: all tools tools-clean statik runsim \
protoc buf protoc-gen-buf-check-breaking protoc-gen-buf-check-lint protoc-gen-gocosmos

###
Expand Down Expand Up @@ -47,21 +47,14 @@ UNAME_M ?= $(shell uname -m)

GOPATH ?= $(shell $(GO) env GOPATH)
GITHUBDIR := $(GOPATH)$(FS)src$(FS)github.com
GOLANGCI_LINT_HASHSUM := f11179f445385a4a6d5079d67de63fe48a9113cee8e9ee0ced19327a83a4394b

BUF_VERSION ?= 0.4.0

TOOLS_DESTDIR ?= $(GOPATH)/bin
GOLANGCI_LINT = $(TOOLS_DESTDIR)/golangci-lint
STATIK = $(TOOLS_DESTDIR)/statik
RUNSIM = $(TOOLS_DESTDIR)/runsim

tools: protoc buf statik runsim golangci-lint

golangci-lint: $(GOLANGCI_LINT)
$(GOLANGCI_LINT): $(mkfile_dir)/install-golangci-lint.sh
@echo "Installing golangci-lint..."
@bash $(mkfile_dir)/install-golangci-lint.sh $(TOOLS_DESTDIR) $(GOLANGCI_LINT_HASHSUM)
tools: protoc buf statik runsim

# Install the runsim binary with a temporary workaround of entering an outside
# directory as the "go get" command ignores the -mod option and will polute the
Expand Down
33 changes: 0 additions & 33 deletions contrib/devtools/install-golangci-lint.sh

This file was deleted.

0 comments on commit 05e40d3

Please sign in to comment.