akovalenko/lnd.xprv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make: change linter gometalinter->golangci-lint

Browse Source
This commit is contained in:
Johan T. Halseth 2019-07-22 11:05:57 +02:00
parent e44445e952
commit 3207c8a736
No known key found for this signature in database
GPG Key ID: 15BAADA29DA20D26
2 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.golangci.yml Normal file
View File

@ -0,0 +1,18 @@
run:
# timeout for analysis
deadline: 4m
linters-settings:
govet:
# Don't report about shadowed variables
check-shadowing: false
gofmt:
# simplify code: gofmt with `-s` option, true by default
simplify: true
linters:
disable-all: true
enable:
- gofmt
- golint
- govet

20
Makefile
View File

@ -3,13 +3,13 @@ ESCPKG := github.com\/lightningnetwork\/lnd
BTCD_PKG := github.com/btcsuite/btcd BTCD_PKG := github.com/btcsuite/btcd
GOVERALLS_PKG := github.com/mattn/goveralls GOVERALLS_PKG := github.com/mattn/goveralls
LINT_PKG := gopkg.in/alecthomas/gometalinter.v2 LINT_PKG := github.com/golangci/golangci-lint/cmd/golangci-lint
GOACC_PKG := github.com/ory/go-acc GOACC_PKG := github.com/ory/go-acc
GO_BIN := ${GOPATH}/bin GO_BIN := ${GOPATH}/bin
BTCD_BIN := $(GO_BIN)/btcd BTCD_BIN := $(GO_BIN)/btcd
GOVERALLS_BIN := $(GO_BIN)/goveralls GOVERALLS_BIN := $(GO_BIN)/goveralls
LINT_BIN := $(GO_BIN)/gometalinter.v2 LINT_BIN := $(GO_BIN)/golangci-lint
GOACC_BIN := $(GO_BIN)/go-acc GOACC_BIN := $(GO_BIN)/go-acc
BTCD_DIR :=${GOPATH}/src/$(BTCD_PKG) BTCD_DIR :=${GOPATH}/src/$(BTCD_PKG)
@ -32,7 +32,6 @@ GOTEST := GO111MODULE=on go test -v
GOFILES_NOVENDOR = $(shell find . -type f -name '*.go' -not -path "./vendor/*") GOFILES_NOVENDOR = $(shell find . -type f -name '*.go' -not -path "./vendor/*")
GOLIST := go list $(PKG)/... | grep -v '/vendor/' GOLIST := go list $(PKG)/... | grep -v '/vendor/'
GOLISTCOVER := $(shell go list -f '{{.ImportPath}}' ./... | sed -e 's/^$(ESCPKG)/./') GOLISTCOVER := $(shell go list -f '{{.ImportPath}}' ./... | sed -e 's/^$(ESCPKG)/./')
GOLISTLINT := $(shell go list -f '{{.Dir}}' ./... | grep -v 'lnrpc')
RM := rm -f RM := rm -f
CP := cp CP := cp
@ -43,15 +42,7 @@ include make/testing_flags.mk
DEV_TAGS := $(if ${tags},$(DEV_TAGS) ${tags},$(DEV_TAGS)) DEV_TAGS := $(if ${tags},$(DEV_TAGS) ${tags},$(DEV_TAGS))
LINT = $(LINT_BIN) \ LINT = $(LINT_BIN) run
--disable-all \
--enable=gofmt \
--enable=vet \
--enable=golint \
--line-length=72 \
--deadline=4m $(GOLISTLINT) 2>&1 | \
grep -v 'ALL_CAPS\|OP_' 2>&1 | \
tee /dev/stderr
GREEN := "\\033[0;32m" GREEN := "\\033[0;32m"
NC := "\\033[0m" NC := "\\033[0m"
@ -72,7 +63,7 @@ $(GOVERALLS_BIN):
go get -u $(GOVERALLS_PKG) go get -u $(GOVERALLS_PKG)
$(LINT_BIN): $(LINT_BIN):
@$(call print, "Fetching gometalinter.v2") @$(call print, "Fetching linter")
GO111MODULE=off go get -u $(LINT_PKG) GO111MODULE=off go get -u $(LINT_PKG)
$(GOACC_BIN): $(GOACC_BIN):
@ -166,8 +157,7 @@ fmt:
lint: $(LINT_BIN) lint: $(LINT_BIN)
@$(call print, "Linting source.") @$(call print, "Linting source.")
GO111MODULE=off $(LINT_BIN) --install 1> /dev/null $(LINT)
test -z "$$($(LINT))"
list: list:
@$(call print, "Listing commands.") @$(call print, "Listing commands.")