diff --git a/.bingo/Variables.mk b/.bingo/Variables.mk index a34abb7f..6d8ab637 100644 --- a/.bingo/Variables.mk +++ b/.bingo/Variables.mk @@ -28,12 +28,6 @@ $(EMBEDMD): .bingo/embedmd.mod @echo "(re)installing $(GOBIN)/embedmd-v1.0.0" @cd .bingo && $(GO) build -modfile=embedmd.mod -o=$(GOBIN)/embedmd-v1.0.0 "github.com/campoy/embedmd" -GOLANGCI_LINT := $(GOBIN)/golangci-lint-v1.27.0 -$(GOLANGCI_LINT): .bingo/golangci-lint.mod - @# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies. - @echo "(re)installing $(GOBIN)/golangci-lint-v1.27.0" - @cd .bingo && $(GO) build -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v1.27.0 "github.com/golangci/golangci-lint/cmd/golangci-lint" - GOTEST := $(GOBIN)/gotest-v0.0.4 $(GOTEST): .bingo/gotest.mod @# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies. diff --git a/.drone.yml b/.drone.yml index e161bc2b..5e753f3c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -35,7 +35,7 @@ steps: CGO_ENABLED: 0 - name: lint - image: golang:1.18.4 + image: docker.io/golangci/golangci-lint:v1.46.2 commands: - make lint environment: diff --git a/Makefile b/Makefile index a6d227de..6fbfcc62 100644 --- a/Makefile +++ b/Makefile @@ -15,6 +15,7 @@ GOBUILD := go build -mod=vendor GOINSTALL := go install -mod=vendor GOMOD := go mod GOFMT := gofmt +GOLANGCI_LINT := golangci-lint LDFLAGS := '-s -w -X main.version=$(VERSION) -X main.commit=$(VCS_REF) -X main.date=$(BUILD_DATE)' TAGS := netgo @@ -129,7 +130,7 @@ test-e2e: $(GOTEST) ; $(info $(M) running test-e2e ) .PHONY: lint lint: ## Runs golangci-lint analysis -lint: $(GOLANGCI_LINT) ; $(info $(M) running lint ) +lint: # Check .golangci.yml for configuration $(Q) $(GOLANGCI_LINT) run -v --enable-all --skip-dirs tmp -c .golangci.yml