Skip to content
This repository was archived by the owner on Feb 11, 2025. It is now read-only.

Commit 75153b2

Browse files
committed
dependabot-1 Moved linting to official docker image from self-installed
1 parent a53a3a8 commit 75153b2

File tree

3 files changed

+3
-8
lines changed

3 files changed

+3
-8
lines changed

.bingo/Variables.mk

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,6 @@ $(EMBEDMD): .bingo/embedmd.mod
2828
@echo "(re)installing $(GOBIN)/embedmd-v1.0.0"
2929
@cd .bingo && $(GO) build -modfile=embedmd.mod -o=$(GOBIN)/embedmd-v1.0.0 "github.com/campoy/embedmd"
3030

31-
GOLANGCI_LINT := $(GOBIN)/golangci-lint-v1.27.0
32-
$(GOLANGCI_LINT): .bingo/golangci-lint.mod
33-
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
34-
@echo "(re)installing $(GOBIN)/golangci-lint-v1.27.0"
35-
@cd .bingo && $(GO) build -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v1.27.0 "github.com/golangci/golangci-lint/cmd/golangci-lint"
36-
3731
GOTEST := $(GOBIN)/gotest-v0.0.4
3832
$(GOTEST): .bingo/gotest.mod
3933
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.

.drone.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ steps:
3535
CGO_ENABLED: 0
3636

3737
- name: lint
38-
image: golang:1.18.4
38+
image: docker.io/golangci/golangci-lint:v1.46.2
3939
commands:
4040
- make lint
4141
environment:

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ GOBUILD := go build -mod=vendor
1515
GOINSTALL := go install -mod=vendor
1616
GOMOD := go mod
1717
GOFMT := gofmt
18+
GOLANGCI_LINT := golangci-lint
1819
LDFLAGS := '-s -w -X main.version=$(VERSION) -X main.commit=$(VCS_REF) -X main.date=$(BUILD_DATE)'
1920
TAGS := netgo
2021

@@ -129,7 +130,7 @@ test-e2e: $(GOTEST) ; $(info $(M) running test-e2e )
129130

130131
.PHONY: lint
131132
lint: ## Runs golangci-lint analysis
132-
lint: $(GOLANGCI_LINT) ; $(info $(M) running lint )
133+
lint:
133134
# Check .golangci.yml for configuration
134135
$(Q) $(GOLANGCI_LINT) run -v --enable-all --skip-dirs tmp -c .golangci.yml
135136

0 commit comments

Comments
 (0)