Skip to content

Commit 2be5a95

Browse files
committed
Makefile: remove markdownlint and move golangci-lint to lint target
1 parent 4b44799 commit 2be5a95

File tree

9 files changed

+2
-196
lines changed

9 files changed

+2
-196
lines changed

.dockerignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
.dockerignore
55
.gitignore
66
.golangci.yml
7-
.markdownlintrc
87
*.out
98
bin/
109
hack/.bin/

.markdownlintrc

Lines changed: 0 additions & 4 deletions
This file was deleted.

Makefile

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -320,25 +320,11 @@ generate-e2e-templates: $(KUSTOMIZE) ## Generate e2e cluster templates
320320

321321
.PHONY: lint
322322
lint: $(GOLANGCI_LINT) ## Lint the codebase
323-
$(MAKE) lint-go-full
324-
$(MAKE) lint-markdown
325-
326-
GOLANGCI_LINT_EXTRA_ARGS ?= --fast=true
327-
.PHONY: lint-go
328-
lint-go: $(GOLANGCI_LINT) ## Lint codebase
329323
$(GOLANGCI_LINT) run -v $(GOLANGCI_LINT_EXTRA_ARGS)
330324

331-
.PHONY: lint-go-full
332-
lint-go-full: GOLANGCI_LINT_EXTRA_ARGS = --fast=false
333-
lint-go-full: lint-go ## Run slower linters to detect possible issues
334-
335-
.PHONY: lint-markdown
336-
lint-markdown: ## Lint the project's markdown
337-
docker run --rm -v "$$(pwd)":/build$(DOCKER_VOL_OPTS) gcr.io/cluster-api-provider-vsphere/extra/mdlint:0.17.0 -- /md/lint -i _releasenotes .
338-
339325
.PHONY: lint-fix
340326
lint-fix: $(GOLANGCI_LINT) ## Lint the codebase and run auto-fixers if supported by the linter
341-
GOLANGCI_LINT_EXTRA_ARGS="--fast=false --fix" $(MAKE) lint-go
327+
GOLANGCI_LINT_EXTRA_ARGS=--fix $(MAKE) lint
342328

343329
APIDIFF_OLD_COMMIT ?= $(shell git rev-parse origin/main)
344330

@@ -349,7 +335,7 @@ apidiff: $(GO_APIDIFF) ## Check for API differences
349335
ALL_VERIFY_CHECKS = boilerplate shellcheck modules gen conversions doctoc flavors
350336

351337
.PHONY: verify
352-
verify: $(addprefix verify-,$(ALL_VERIFY_CHECKS)) lint-markdown ## Run all verify-* targets
338+
verify: $(addprefix verify-,$(ALL_VERIFY_CHECKS)) ## Run all verify-* targets
353339

354340
.PHONY: verify-modules
355341
verify-modules: generate-modules ## Verify go modules are up to date

hack/check-format.sh

Lines changed: 0 additions & 28 deletions
This file was deleted.

hack/check-lint.sh

Lines changed: 0 additions & 28 deletions
This file was deleted.

hack/check-mdlint.sh

Lines changed: 0 additions & 28 deletions
This file was deleted.

hack/check-vet.sh

Lines changed: 0 additions & 28 deletions
This file was deleted.

hack/tools/mdlint/Dockerfile

Lines changed: 0 additions & 34 deletions
This file was deleted.

hack/tools/mdlint/Makefile

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)