Switch to golangci-lint

This commit is contained in:
9seconds
2018-07-18 08:37:37 +03:00
parent c1e5c33076
commit c1b862c1e9
19 changed files with 194 additions and 112 deletions
+11 -10
View File
@@ -1,12 +1,13 @@
ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
IMAGE_NAME := mtg
APP_NAME := $(IMAGE_NAME)
GOMETALINTER := gometalinter
VENDOR_FILES := $(shell find "$(ROOT_DIR)/vendor" 2>/dev/null || echo -n "vendor")
CC_BINARIES := $(shell bash -c "echo -n $(APP_NAME)-{linux,freebsd,openbsd}-{386,amd64} $(APP_NAME)-linux-{arm,arm64}")
APP_DEPS := version.go $(VENDOR_FILES)
GOLANGCI_LINT_VERSION := v1.9.1
COMMON_BUILD_FLAGS := -ldflags="-s -w"
# -----------------------------------------------------------------------------
@@ -31,7 +32,7 @@ ccbuilds:
version.go:
@go generate main.go
vendor: Gopkg.lock Gopkg.toml install-cli
vendor: Gopkg.lock Gopkg.toml install-dep
@dep ensure
# -----------------------------------------------------------------------------
@@ -50,12 +51,12 @@ crosscompile-dir:
@rm -rf "$(CC_DIR)" && mkdir -p "$(CC_DIR)"
.PHONY: test
test: vendor install-cli version.go
test: vendor version.go
@go test -v ./...
.PHONY: lint
lint: vendor install-cli version.go
@$(GOMETALINTER) --deadline=2m ./...
lint: version.go
@golangci-lint run
.PHONY: clean
clean:
@@ -67,14 +68,14 @@ clean:
docker:
@docker build --pull -t "$(IMAGE_NAME)" "$(ROOT_DIR)"
.PHONY: install-cli
install-cli: install-dep install-lint
.PHONY: prepare
prepare: install-dep install-lint
.PHONY: install-dep
install-dep:
@go get github.com/golang/dep/cmd/dep
@go get -u github.com/golang/dep/cmd/dep
.PHONY: install-lint
install-lint:
@go get github.com/alecthomas/gometalinter && \
$(GOMETALINTER) --install >/dev/null
@curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh \
| bash -s -- -b $(GOPATH)/bin $(GOLANGCI_LINT_VERSION)