Skip to content

Commit

Permalink
Merge pull request #2256 from k8s-infra-cherrypick-robot/cherry-pick-…
Browse files Browse the repository at this point in the history
…2254-to-release-1.8

[release-1.8] 🌱 Makefile: remove markdownlint and move golangci-lint to lint target
  • Loading branch information
k8s-ci-robot authored Aug 18, 2023
2 parents 5abf7de + 23e757e commit ef64073
Show file tree
Hide file tree
Showing 9 changed files with 2 additions and 196 deletions.
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 _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.

0 comments on commit ef64073

Please sign in to comment.