Skip to content

Commit be37695

Browse files
committed
change linter to min till we fix it
1 parent 3155608 commit be37695

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

Makefile

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ MINIKUBE_RELEASES_URL=https://github.com/kubernetes/minikube/releases/download
7676
# update this only by running `make update-golint-version`
7777
GOLINT_VERSION ?= v2.6.2
7878
# see https://golangci-lint.run/docs/configuration/file/ for config details
79-
GOLINT_CONFIG ?= .golangci.yaml
79+
GOLINT_CONFIG ?= .golangci.min.yaml
8080
# Set this to --verbose to see details about the linters and formatters used
8181
GOLINT_VERBOSE ?=
8282
# Limit number of default jobs, to avoid the CI builds running out of memory
@@ -523,22 +523,21 @@ out/linters/golangci-lint-$(GOLINT_VERSION):
523523
ifeq ($(MINIKUBE_BUILD_IN_DOCKER),y)
524524
lint:
525525
docker run --rm -v `pwd`:/app:Z -w /app golangci/golangci-lint:$(GOLINT_VERSION) \
526-
./out/linters/golangci-lint-$(GOLINT_VERSION) run --config .golangci.min.yaml ./...
526+
./out/linters/golangci-lint-$(GOLINT_VERSION) run ${GOLINT_OPTIONS} ./...
527527
else
528528
lint: out/linters/golangci-lint-$(GOLINT_VERSION) ## Run lint
529-
./out/linters/golangci-lint-$(GOLINT_VERSION) run --config .golangci.min.yaml ./...
529+
./out/linters/golangci-lint-$(GOLINT_VERSION) run ${GOLINT_OPTIONS} ./...
530530
endif
531531

532532
.PHONY: lint-max
533533
lint-max: out/linters/golangci-lint-$(GOLINT_VERSION) ## Run lint
534-
./out/linters/golangci-lint-$(GOLINT_VERSION) run --config .golangci.max.yaml ./...
535-
534+
./out/linters/golangci-lint-$(GOLINT_VERSION) run ${GOLINT_OPTIONS} --config .golangci.max.yaml ./...
536535

537536
# lint-ci is slower version of lint and is meant to be used in ci (travis) to avoid out of memory leaks.
538537
.PHONY: lint-ci
539538
lint-ci: out/linters/golangci-lint-$(GOLINT_VERSION) ## Run lint-ci
540539
GOGC=${GOLINT_GOGC} ./out/linters/golangci-lint-$(GOLINT_VERSION) run \
541-
--concurrency ${GOLINT_JOBS} --config .golangci.min.yaml ./...
540+
--concurrency ${GOLINT_JOBS} ${GOLINT_OPTIONS} ./...
542541

543542
.PHONY: reportcard
544543
reportcard: ## Run goreportcard for minikube

0 commit comments

Comments
 (0)