Skip to content

Commit

Permalink
build: fix eslint makefile target
Browse files Browse the repository at this point in the history
PR-URL: #54999
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com>
  • Loading branch information
Aviv Keller authored Sep 20, 2024
1 parent 8b8fc53 commit 81cc729
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -1388,19 +1388,19 @@ run-lint-js = tools/eslint/node_modules/eslint/bin/eslint.js --cache \
--max-warnings=0 --report-unused-disable-directives $(LINT_JS_TARGETS)
run-lint-js-fix = $(run-lint-js) --fix

tools/eslint/node_modules: tools/eslint/package-lock.json
tools/eslint/node_modules/eslint/bin/eslint.js: tools/eslint/package-lock.json
-cd tools/eslint && $(call available-node,$(run-npm-ci))

.PHONY: lint-js-fix
lint-js-fix: tools/eslint/node_modules
lint-js-fix: tools/eslint/node_modules/eslint/bin/eslint.js
@$(call available-node,$(run-lint-js-fix))

.PHONY: lint-js
.PHONY: lint-js-doc
# Note that on the CI `lint-js-ci` is run instead.
# Lints the JavaScript code with eslint.
lint-js-doc: LINT_JS_TARGETS=doc
lint-js lint-js-doc: tools/eslint/node_modules
lint-js lint-js-doc: tools/eslint/node_modules/eslint/bin/eslint.js
@if [ "$(shell $(node_use_openssl))" != "true" ]; then \
echo "Skipping $@ (no crypto)"; \
else \
Expand All @@ -1417,7 +1417,7 @@ run-lint-js-ci = tools/eslint/node_modules/eslint/bin/eslint.js \

.PHONY: lint-js-ci
# On the CI the output is emitted in the TAP format.
lint-js-ci: tools/eslint/node_modules
lint-js-ci: tools/eslint/node_modules/eslint/bin/eslint.js
$(info Running JS linter...)
@$(call available-node,$(run-lint-js-ci))

Expand Down

0 comments on commit 81cc729

Please sign in to comment.