Skip to content

Commit 661b648

Browse files
authored
Merge pull request #363 from projectsyn/make-yaml_lint-exclude-crossplatform
Make yamllint exludes work on both BSD and GNU
2 parents 36e273f + 9b68894 commit 661b648

3 files changed

Lines changed: 9 additions & 3 deletions

File tree

commodore/component-template/{{ cookiecutter.slug }}/.yamllint.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,10 @@ rules:
55
line-length:
66
max: 80
77
level: warning
8+
9+
ignore: |
10+
dependencies/
11+
helmcharts/
12+
manifests/
13+
vendor/
14+
compiled/

commodore/component-template/{{ cookiecutter.slug }}/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ lint_jsonnet: $(JSONNET_FILES) ## Lint jsonnet files
2222
$(JSONNET_DOCKER) $(JSONNETFMT_ARGS) --test -- $?
2323

2424
.PHONY: lint_yaml
25-
lint_yaml: $(YAML_FILES) ## Lint yaml files
26-
$(YAMLLINT_DOCKER) -f parsable -c $(YAMLLINT_CONFIG) $(YAMLLINT_ARGS) -- $?
25+
lint_yaml: ## Lint yaml files
26+
$(YAMLLINT_DOCKER) -f parsable -c $(YAMLLINT_CONFIG) $(YAMLLINT_ARGS) -- .
2727

2828
.PHONY: lint_adoc
2929
lint_adoc: ## Lint documentation

commodore/component-template/{{ cookiecutter.slug }}/Makefile.vars.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ JSONNETFMT_ARGS ?= --in-place --pad-arrays
1313
JSONNET_IMAGE ?= docker.io/bitnami/jsonnet:latest
1414
JSONNET_DOCKER ?= $(DOCKER_CMD) $(DOCKER_ARGS) $(root_volume) --entrypoint=jsonnetfmt $(JSONNET_IMAGE)
1515

16-
YAML_FILES ?= $(shell find . -type f -not -path './vendor/*' \( -name '*.yaml' -or -name '*.yml' \))
1716
YAMLLINT_ARGS ?= --no-warnings
1817
YAMLLINT_CONFIG ?= .yamllint.yml
1918
YAMLLINT_IMAGE ?= docker.io/cytopia/yamllint:latest

0 commit comments

Comments
 (0)