Skip to content

Commit 3155608

Browse files
committed
change default lint to min
1 parent 22af4fc commit 3155608

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

Makefile

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -523,20 +523,22 @@ 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-
golangci-lint run ${GOLINT_OPTIONS} ./..."
527-
# --skip-dirs "cmd/drivers/kvm|cmd/drivers/hyperkit|pkg/drivers/kvm|pkg/drivers/hyperkit"
528-
# The "--skip-dirs" parameter is no longer supported in the V2 version. If you need to skip the directory,
529-
# add it under "linters.settings.exclusions.paths" in the ".golangci.yaml" file.
526+
./out/linters/golangci-lint-$(GOLINT_VERSION) run --config .golangci.min.yaml ./...
530527
else
531528
lint: out/linters/golangci-lint-$(GOLINT_VERSION) ## Run lint
532-
./out/linters/golangci-lint-$(GOLINT_VERSION) run ${GOLINT_OPTIONS} ./...
529+
./out/linters/golangci-lint-$(GOLINT_VERSION) run --config .golangci.min.yaml ./...
533530
endif
534531

532+
.PHONY: lint-max
533+
lint-max: out/linters/golangci-lint-$(GOLINT_VERSION) ## Run lint
534+
./out/linters/golangci-lint-$(GOLINT_VERSION) run --config .golangci.max.yaml ./...
535+
536+
535537
# lint-ci is slower version of lint and is meant to be used in ci (travis) to avoid out of memory leaks.
536538
.PHONY: lint-ci
537539
lint-ci: out/linters/golangci-lint-$(GOLINT_VERSION) ## Run lint-ci
538540
GOGC=${GOLINT_GOGC} ./out/linters/golangci-lint-$(GOLINT_VERSION) run \
539-
--concurrency ${GOLINT_JOBS} ${GOLINT_OPTIONS} ./...
541+
--concurrency ${GOLINT_JOBS} --config .golangci.min.yaml ./...
540542

541543
.PHONY: reportcard
542544
reportcard: ## Run goreportcard for minikube

0 commit comments

Comments
 (0)