File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 33BUILDTYPE ?= Release
44PYTHON ?= python3
55RUFF ?= tools/pip/site-packages/bin/ruff
6+ YAMLLINT ?= tools/pip/site-packages/bin/yamllint
67DESTDIR ?=
78SIGN ?=
89PREFIX ?= /usr/local
@@ -1719,14 +1720,15 @@ lint-yaml-build: ## Build resources needed to lint YAML files.
17191720 $(PYTHON ) -m pip install --upgrade --system -t tools/pip/site-packages yamllint
17201721
17211722.PHONY : lint-yaml
1723+ ifneq ("","$(wildcard $(YAMLLINT ) ) ")
17221724lint-yaml : # # Lint the YAML files with yamllint.
1723- @if [ -d " tools/pip/site-packages/yamllint " ] ; then \
1724- $( info Running YAML linter...) \
1725- PYTHONPATH=tools/pip $( PYTHON ) -m yamllint . ; \
1726- else \
1727- echo ' YAML linting with yamllint is not available' ; \
1728- echo " Run 'make lint-yaml-build'" ; \
1729- fi
1725+ $( info Running YAML linter...)
1726+ $( YAMLLINT ) .
1727+ else
1728+ lint-yaml :
1729+ $( warning YAML linting with yamllint is not available)
1730+ $( warning Run 'make lint-yaml-build')
1731+ endif
17301732
17311733.PHONY : lint
17321734.PHONY : lint-ci
Original file line number Diff line number Diff line change @@ -149,6 +149,14 @@ pkgs.mkShell {
149149 RUFF = pkgs . lib . getExe ruff ;
150150 }
151151 )
152+ // (
153+ let
154+ yamllint = pkgs . lib . lists . findFirst ( p : p . meta . mainProgram == "yamllint" ) null devTools ;
155+ in
156+ pkgs . lib . optionalAttrs ( yamllint != null ) {
157+ YAMLLINT = pkgs . lib . getExe yamllint ;
158+ }
159+ )
152160 // pkgs . lib . optionalAttrs ( ! withSQLite ) {
153161 NOSQLITE = "1" ;
154162 }
Original file line number Diff line number Diff line change 99 pkgs . jq
1010 pkgs . ruff
1111 pkgs . shellcheck
12+ pkgs . yamllint
1213]
1314++ (
1415 if ( ncu-path == null ) then
You can’t perform that action at this time.
0 commit comments