Skip to content

Commit

Permalink
dependabot-1 Moved linting to official docker image from self-installed
Browse files Browse the repository at this point in the history
  • Loading branch information
bdebyl committed Jul 15, 2022
1 parent a53a3a8 commit 75153b2
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 8 deletions.
6 changes: 0 additions & 6 deletions .bingo/Variables.mk
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion .drone.yml
Expand Up @@ -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:
Expand Down
3 changes: 2 additions & 1 deletion Makefile
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down

0 comments on commit 75153b2

Please sign in to comment.