File tree Expand file tree Collapse file tree 3 files changed +4
-6
lines changed Expand file tree Collapse file tree 3 files changed +4
-6
lines changed Original file line number Diff line number Diff line change @@ -25,7 +25,7 @@ lint: out/linters/shellcheck-$(SHELLCHECK_VERSION)-$(LINT_ARCH)/shellcheck out/l
2525 out/linters/golangci-lint-$(GOLINT_VERSION ) -$(LINT_ARCH ) run
2626 out/linters/hadolint-$(HADOLINT_VERSION ) -$(LINT_ARCH ) $(shell find . -name "* Dockerfile")
2727 out/linters/shellcheck-$(SHELLCHECK_VERSION ) -$(LINT_ARCH ) /shellcheck $(shell find . -name "* .sh")
28- PYTHONPATH=$(YAMLLINT_ROOT ) /lib $(YAMLLINT_ROOT ) /bin/yamllint .
28+ PYTHONPATH=$(YAMLLINT_ROOT ) /dist $(YAMLLINT_ROOT ) /dist /bin/yamllint .
2929
3030fix : out/linters/shellcheck-$(SHELLCHECK_VERSION ) -$(LINT_ARCH ) /shellcheck out/linters/golangci-lint-$(GOLINT_VERSION ) -$(LINT_ARCH )
3131 out/linters/golangci-lint-$(GOLINT_VERSION ) -$(LINT_ARCH ) run --fix
@@ -47,7 +47,6 @@ out/linters/golangci-lint-$(GOLINT_VERSION)-$(LINT_ARCH):
4747 mv out/linters/golangci-lint out/linters/golangci-lint-$(GOLINT_VERSION ) -$(LINT_ARCH )
4848
4949$(YAMLLINT_ROOT ) /bin/yamllint :
50- mkdir -p $(YAMLLINT_ROOT ) /lib
5150 curl -sSfL https://github.com/adrienverge/yamllint/archive/refs/tags/v$(YAMLLINT_VERSION ) .tar.gz | tar -C out/linters -zxf -
52- cd $(YAMLLINT_ROOT ) && PYTHONPATH=lib python setup.py -q install --prefix . --install-lib lib
51+ cd $(YAMLLINT_ROOT ) && pip3 install . -t dist
5352# END: lint-install .
Original file line number Diff line number Diff line change @@ -53,9 +53,8 @@ out/linters/golangci-lint-$(GOLINT_VERSION)-$(LINT_ARCH):
5353
5454{{ if .YAML -}}
5555$(YAMLLINT_ROOT)/bin/yamllint:
56- mkdir -p $(YAMLLINT_ROOT)/lib
5756 curl -sSfL https://github.com/adrienverge/yamllint/archive/refs/tags/v$(YAMLLINT_VERSION).tar.gz | tar -C out/linters -zxf -
58- cd $(YAMLLINT_ROOT) && PYTHONPATH=lib python setup.py -q install --prefix . --install-lib lib
57+ cd $(YAMLLINT_ROOT) && pip3 install . -t dist
5958{{ end -}}
6059
6160# END: lint-install {{.Args}}
Original file line number Diff line number Diff line change @@ -234,7 +234,7 @@ func yamlLintCmd(_ string, level string) string {
234234 if level == "warn" {
235235 suffix = " || true"
236236 }
237- return fmt .Sprintf (`PYTHONPATH=$(YAMLLINT_ROOT)/lib $(YAMLLINT_ROOT)/bin/yamllint .%s` , suffix )
237+ return fmt .Sprintf (`PYTHONPATH=$(YAMLLINT_ROOT)/dist $(YAMLLINT_ROOT)/dist /bin/yamllint .%s` , suffix )
238238}
239239
240240// main creates peanut butter & jelly sandwiches with utmost precision.
You can’t perform that action at this time.
0 commit comments