diff --git a/.editorconfig b/.editorconfig index 9a20762..558bf79 100644 --- a/.editorconfig +++ b/.editorconfig @@ -11,10 +11,8 @@ trim_trailing_whitespace = true [*.md] trim_trailing_whitespace = false -[*{.yml,.yaml}] -indent_style = space +[*.{yml,yaml}] indent_size = 2 -[*.json] -indent_style = space -indent_size = 4 +[Makefile] +indent_style = tab diff --git a/Makefile b/Makefile index 53d60c1..c17a957 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ ACTION_LINT_RUNNER ?= $(DOCKER) run --rm $$(tty -s && echo "-it" || echo) \ -v $(shell pwd):/repo \ --workdir /repo \ rhysd/actionlint:latest \ - -color + -color -verbose # # Self documenting Makefile code @@ -77,11 +77,11 @@ lint: lint-yaml lint-actions ## Lint all files .PHONY: lint lint-yaml: ## Lint all yaml files - @$(YAML_LINT_RUNNER) + @$(YAML_LINT_RUNNER) | tee -a $(MAKE_LOGFILE) .PHONY: lint-yaml lint-actions: ## Lint all github actions - @$(ACTION_LINT_RUNNER) + @$(ACTION_LINT_RUNNER) | tee -a $(MAKE_LOGFILE) .PHONY: lint-actions #