Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release-1.6] 🌱 Makefile: remove markdownlint and move golangci-lint to lint target #2258

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
.dockerignore
.gitignore
.golangci.yml
.markdownlintrc
*.out
bin/
hack/.bin/
Expand Down
4 changes: 0 additions & 4 deletions .markdownlintrc

This file was deleted.

18 changes: 2 additions & 16 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -320,25 +320,11 @@ generate-e2e-templates: ## Generate e2e cluster templates

.PHONY: lint
lint: $(GOLANGCI_LINT) ## Lint the codebase
$(MAKE) lint-go-full
$(MAKE) lint-markdown

GOLANGCI_LINT_EXTRA_ARGS ?= --fast=true
.PHONY: lint-go
lint-go: $(GOLANGCI_LINT) ## Lint codebase
$(GOLANGCI_LINT) run -v $(GOLANGCI_LINT_EXTRA_ARGS)

.PHONY: lint-go-full
lint-go-full: GOLANGCI_LINT_EXTRA_ARGS = --fast=false
lint-go-full: lint-go ## Run slower linters to detect possible issues

.PHONY: lint-markdown
lint-markdown: ## Lint the project's markdown
docker run --rm -v "$$(pwd)":/build$(DOCKER_VOL_OPTS) gcr.io/cluster-api-provider-vsphere/extra/mdlint:0.17.0 -- /md/lint -i contrib/haproxy/openapi -i _releasenotes .

.PHONY: lint-fix
lint-fix: $(GOLANGCI_LINT) ## Lint the codebase and run auto-fixers if supported by the linter
GOLANGCI_LINT_EXTRA_ARGS="--fast=false --fix" $(MAKE) lint-go
GOLANGCI_LINT_EXTRA_ARGS=--fix $(MAKE) lint

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

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

.PHONY: verify
verify: $(addprefix verify-,$(ALL_VERIFY_CHECKS)) lint-markdown ## Run all verify-* targets
verify: $(addprefix verify-,$(ALL_VERIFY_CHECKS)) ## Run all verify-* targets

.PHONY: verify-modules
verify-modules: generate-modules ## Verify go modules are up to date
Expand Down
28 changes: 0 additions & 28 deletions hack/check-format.sh

This file was deleted.

28 changes: 0 additions & 28 deletions hack/check-lint.sh

This file was deleted.

28 changes: 0 additions & 28 deletions hack/check-mdlint.sh

This file was deleted.

28 changes: 0 additions & 28 deletions hack/check-vet.sh

This file was deleted.

34 changes: 0 additions & 34 deletions hack/tools/mdlint/Dockerfile

This file was deleted.

29 changes: 0 additions & 29 deletions hack/tools/mdlint/Makefile

This file was deleted.