mirrors/k3d
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use golangci-lint v1.20

Browse Source
This commit is contained in:
iwilltry42 2019-10-10 11:42:34 +02:00
parent a13a4cc2ce
commit 97739d12d1
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -8,7 +8,7 @@ git:
depth: 1 depth: 1
install: true install: true
before_script: before_script:
- curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b ${GOPATH}/bin v1.17.1 - curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b ${GOPATH}/bin v1.20.0
- go get github.com/mitchellh/gox@v1.0.1 - go get github.com/mitchellh/gox@v1.0.1
script: script:
- make fmt check build-cross - make fmt check build-cross

17
Makefile
View File

@ -32,10 +32,11 @@ BINARIES := k3d
# Go Package required # Go Package required
PKG_GOX := github.com/mitchellh/gox@v1.0.1 PKG_GOX := github.com/mitchellh/gox@v1.0.1
PKG_GOLANGCI_LINT := github.com/golangci/golangci-lint/cmd/golangci-lint@v1.17.1 PKG_GOLANGCI_LINT_VERSION := v1.20.0
PKG_GOLANGCI_LINT := github.com/golangci/golangci-lint/cmd/golangci-lint@${PKG_GOLANGCI_LINT_VERSION}
# configuration adjustments for golangci-lint # configuration adjustments for golangci-lint
GOLANGCI_LINT_DISABLED_LINTERS := typecheck # disabling typecheck, because it currently (06.09.2019) fails with Go 1.13 GOLANGCI_LINT_DISABLED_LINTERS := "" # disabling typecheck, because it currently (06.09.2019) fails with Go 1.13
# Use Go Modules for everything # Use Go Modules for everything
export GO111MODULE=on export GO111MODULE=on
@ -44,7 +45,7 @@ export GO111MODULE=on
# DIRS defines a single level directly, we only look at *.go in this directory. # DIRS defines a single level directly, we only look at *.go in this directory.
# REC_DIRS defines a source code tree. All go files are analyzed recursively. # REC_DIRS defines a source code tree. All go files are analyzed recursively.
DIRS := . DIRS := .
REC_DIRS := cmd REC_DIRS := cli
# Rules for finding all go source files using 'DIRS' and 'REC_DIRS' # Rules for finding all go source files using 'DIRS' and 'REC_DIRS'
GO_SRC := $(foreach dir,$(DIRS),$(wildcard $(dir)/*.go)) GO_SRC := $(foreach dir,$(DIRS),$(wildcard $(dir)/*.go))
@ -58,7 +59,7 @@ LINT_DIRS := $(DIRS) $(foreach dir,$(REC_DIRS),$(dir)/...)
all: clean fmt check build all: clean fmt check build
build: build:
$(GO) build -i $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' -o '$(BINDIR)/$(BINARIES)' CGO_ENABLED=0 $(GO) build -i $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' -o '$(BINDIR)/$(BINARIES)'
build-cross: LDFLAGS += -extldflags "-static" build-cross: LDFLAGS += -extldflags "-static"
build-cross: build-cross:
@ -68,8 +69,8 @@ clean:
@rm -rf $(BINDIR) _dist/ @rm -rf $(BINDIR) _dist/
extra-clean: clean extra-clean: clean
go clean -i $(PKG_GOX) $(GO) clean -i $(PKG_GOX)
go clean -i $(PKG_GOLANGCI_LINT) $(GO) clean -i $(PKG_GOLANGCI_LINT)
# fmt will fix the golang source style in place. # fmt will fix the golang source style in place.
fmt: fmt:
@ -90,8 +91,8 @@ HAS_GOLANGCI := $(shell command -v golangci-lint 2> /dev/null)
install-tools: install-tools:
ifndef HAS_GOX ifndef HAS_GOX
(go get $(PKG_GOX)) ($(GO) get $(PKG_GOX))
endif endif
ifndef HAS_GOLANGCI ifndef HAS_GOLANGCI
(curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b ${GOPATH}/bin v1.19.1) (curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b ${GOPATH}/bin ${PKG_GOLANGCI_LINT_VERSION})
endif endif