Skip to content

Commit 944e9c5

Browse files
committed
Fix make dependency for yamllint script path
yammllint gets installed as dist/bin/yamllint but make is tracking bin/yammlint which causes make to download/install it everytime. Signed-off-by: Manuel Mendez <[email protected]>
1 parent f4f8e9a commit 944e9c5

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ GOLINT_CONFIG = $(LINT_ROOT)/.golangci.yml
2222
YAMLLINT_ROOT = out/linters/yamllint-$(YAMLLINT_VERSION)
2323

2424
.PHONY: lint
25-
lint: out/linters/shellcheck-$(SHELLCHECK_VERSION)-$(LINT_ARCH)/shellcheck out/linters/hadolint-$(HADOLINT_VERSION)-$(LINT_ARCH) out/linters/golangci-lint-$(GOLINT_VERSION)-$(LINT_ARCH) $(YAMLLINT_ROOT)/bin/yamllint
25+
lint: out/linters/shellcheck-$(SHELLCHECK_VERSION)-$(LINT_ARCH)/shellcheck out/linters/hadolint-$(HADOLINT_VERSION)-$(LINT_ARCH) out/linters/golangci-lint-$(GOLINT_VERSION)-$(LINT_ARCH) $(YAMLLINT_ROOT)/dist/bin/yamllint
2626
out/linters/golangci-lint-$(GOLINT_VERSION)-$(LINT_ARCH) run
2727
out/linters/hadolint-$(HADOLINT_VERSION)-$(LINT_ARCH) $(shell find . -name "*Dockerfile")
2828
out/linters/shellcheck-$(SHELLCHECK_VERSION)-$(LINT_ARCH)/shellcheck $(shell find . -name "*.sh")
@@ -51,7 +51,7 @@ out/linters/golangci-lint-$(GOLINT_VERSION)-$(LINT_ARCH):
5151
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b out/linters $(GOLINT_VERSION)
5252
mv out/linters/golangci-lint out/linters/golangci-lint-$(GOLINT_VERSION)-$(LINT_ARCH)
5353

54-
$(YAMLLINT_ROOT)/bin/yamllint:
54+
$(YAMLLINT_ROOT)/dist/bin/yamllint:
5555
mkdir -p out/linters
5656
rm -rf out/linters/yamllint-*
5757
curl -sSfL https://github.com/adrienverge/yamllint/archive/refs/tags/v$(YAMLLINT_VERSION).tar.gz | tar -C out/linters -zxf -

Makefile.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ endif
2222
{{ if .YAML }}YAMLLINT_ROOT = out/linters/yamllint-$(YAMLLINT_VERSION){{ end }}
2323

2424
.PHONY: lint
25-
lint: {{ if .Shell }}out/linters/shellcheck-$(SHELLCHECK_VERSION)-$(LINT_ARCH)/shellcheck {{ end }}{{ if .Dockerfile }}out/linters/hadolint-$(HADOLINT_VERSION)-$(LINT_ARCH) {{ end }}{{ if .Go}}out/linters/golangci-lint-$(GOLINT_VERSION)-$(LINT_ARCH) {{ end }}{{ if .YAML}}$(YAMLLINT_ROOT)/bin/yamllint{{ end }}
25+
lint: {{ if .Shell }}out/linters/shellcheck-$(SHELLCHECK_VERSION)-$(LINT_ARCH)/shellcheck {{ end }}{{ if .Dockerfile }}out/linters/hadolint-$(HADOLINT_VERSION)-$(LINT_ARCH) {{ end }}{{ if .Go}}out/linters/golangci-lint-$(GOLINT_VERSION)-$(LINT_ARCH) {{ end }}{{ if .YAML}}$(YAMLLINT_ROOT)/dist/bin/yamllint{{ end }}
2626
{{- range .LintCommands }}
2727
{{ .}}{{ end}}
2828

@@ -57,7 +57,7 @@ out/linters/golangci-lint-$(GOLINT_VERSION)-$(LINT_ARCH):
5757
{{ end -}}
5858

5959
{{ if .YAML -}}
60-
$(YAMLLINT_ROOT)/bin/yamllint:
60+
$(YAMLLINT_ROOT)/dist/bin/yamllint:
6161
mkdir -p out/linters
6262
rm -rf out/linters/yamllint-*
6363
curl -sSfL https://github.com/adrienverge/yamllint/archive/refs/tags/v$(YAMLLINT_VERSION).tar.gz | tar -C out/linters -zxf -

0 commit comments

Comments
 (0)