Skip to content

Commit be0778b

Browse files
committed
build: make lint-md independent of local node
PR-URL: #18272 Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 695ed67 commit be0778b

File tree

1 file changed

+16
-11
lines changed

1 file changed

+16
-11
lines changed

Makefile

+16-11
Original file line numberDiff line numberDiff line change
@@ -959,27 +959,32 @@ lint-md-clean:
959959
lint-md-build:
960960
@if [ ! -d tools/remark-cli/node_modules ]; then \
961961
echo "Markdown linter: installing remark-cli into tools/"; \
962-
cd tools/remark-cli && ../../$(NODE) ../../$(NPM) install; fi
962+
cd tools/remark-cli && $(call available-node,$(run-npm-install)) fi
963963
@if [ ! -d tools/remark-preset-lint-node/node_modules ]; then \
964964
echo "Markdown linter: installing remark-preset-lint-node into tools/"; \
965-
cd tools/remark-preset-lint-node && ../../$(NODE) ../../$(NPM) install; fi
965+
cd tools/remark-preset-lint-node && $(call available-node,$(run-npm-install)) fi
966+
966967

967968
.PHONY: lint-md
968969
ifneq ("","$(wildcard tools/remark-cli/node_modules/)")
969-
LINT_MD_TARGETS = src lib benchmark tools/doc tools/icu
970-
LINT_MD_ROOT_DOCS := $(wildcard *.md)
971-
LINT_MD_FILES := $(shell find $(LINT_MD_TARGETS) -type f \
972-
-not -path '*node_modules*' -name '*.md') $(LINT_MD_ROOT_DOCS)
973-
LINT_DOC_MD_FILES = $(shell ls doc/**/*.md)
974970

975-
tools/.docmdlintstamp: $(LINT_DOC_MD_FILES)
971+
LINT_MD_DOC_FILES = $(shell ls doc/**/*.md)
972+
run-lint-doc-md = tools/remark-cli/cli.js -q -f $(LINT_MD_DOC_FILES)
973+
# Lint all changed markdown files under doc/
974+
tools/.docmdlintstamp: $(LINT_MD_DOC_FILES)
976975
@echo "Running Markdown linter on docs..."
977-
@$(NODE) tools/remark-cli/cli.js -q -f $(LINT_DOC_MD_FILES)
976+
@$(call available-node,$(run-lint-doc-md))
978977
@touch $@
979978

980-
tools/.miscmdlintstamp: $(LINT_MD_FILES)
979+
LINT_MD_TARGETS = src lib benchmark tools/doc tools/icu
980+
LINT_MD_ROOT_DOCS := $(wildcard *.md)
981+
LINT_MD_MISC_FILES := $(shell find $(LINT_MD_TARGETS) -type f \
982+
-not -path '*node_modules*' -name '*.md') $(LINT_MD_ROOT_DOCS)
983+
run-lint-misc-md = tools/remark-cli/cli.js -q -f $(LINT_MD_MISC_FILES)
984+
# Lint other changed markdown files maintained by us
985+
tools/.miscmdlintstamp: $(LINT_MD_MISC_FILES)
981986
@echo "Running Markdown linter on misc docs..."
982-
@$(NODE) tools/remark-cli/cli.js -q -f $(LINT_MD_FILES)
987+
@$(call available-node,$(run-lint-misc-md))
983988
@touch $@
984989

985990
tools/.mdlintstamp: tools/.miscmdlintstamp tools/.docmdlintstamp

0 commit comments

Comments
 (0)