Skip to content

Commit d537f45

Browse files
joyeecheungBethGriggs
authored andcommitted
build: make lint-md independent of local node
PR-URL: #18272 Backport-PR-URL: #19190 Reviewed-By: Gibson Fahnestock <[email protected]> Reviewed-By: James M Snell <[email protected]>
1 parent 016a28a commit d537f45

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
@@ -1008,26 +1008,31 @@ lint-md-clean:
10081008
lint-md-build:
10091009
@if [ ! -d tools/remark-cli/node_modules ]; then \
10101010
echo "Markdown linter: installing remark-cli into tools/"; \
1011-
cd tools/remark-cli && ../../$(NODE) ../../$(NPM) install; fi
1011+
cd tools/remark-cli && $(call available-node,$(run-npm-install)) fi
10121012
@if [ ! -d tools/remark-preset-lint-node/node_modules ]; then \
10131013
echo "Markdown linter: installing remark-preset-lint-node into tools/"; \
1014-
cd tools/remark-preset-lint-node && ../../$(NODE) ../../$(NPM) install; fi
1014+
cd tools/remark-preset-lint-node && $(call available-node,$(run-npm-install)) fi
1015+
10151016

10161017
ifneq ("","$(wildcard tools/remark-cli/node_modules/)")
1017-
LINT_MD_TARGETS = src lib benchmark tools/doc tools/icu
1018-
LINT_MD_ROOT_DOCS := $(wildcard *.md)
1019-
LINT_MD_FILES := $(shell find $(LINT_MD_TARGETS) -type f \
1020-
-not -path '*node_modules*' -name '*.md') $(LINT_MD_ROOT_DOCS)
1021-
LINT_DOC_MD_FILES = $(shell ls doc/**/*.md)
10221018

1023-
tools/.docmdlintstamp: $(LINT_DOC_MD_FILES)
1019+
LINT_MD_DOC_FILES = $(shell ls doc/**/*.md)
1020+
run-lint-doc-md = tools/remark-cli/cli.js -q -f $(LINT_MD_DOC_FILES)
1021+
# Lint all changed markdown files under doc/
1022+
tools/.docmdlintstamp: $(LINT_MD_DOC_FILES)
10241023
@echo "Running Markdown linter on docs..."
1025-
@$(NODE) tools/remark-cli/cli.js -q -f $(LINT_DOC_MD_FILES)
1024+
@$(call available-node,$(run-lint-doc-md))
10261025
@touch $@
10271026

1028-
tools/.miscmdlintstamp: $(LINT_MD_FILES)
1027+
LINT_MD_TARGETS = src lib benchmark tools/doc tools/icu
1028+
LINT_MD_ROOT_DOCS := $(wildcard *.md)
1029+
LINT_MD_MISC_FILES := $(shell find $(LINT_MD_TARGETS) -type f \
1030+
-not -path '*node_modules*' -name '*.md') $(LINT_MD_ROOT_DOCS)
1031+
run-lint-misc-md = tools/remark-cli/cli.js -q -f $(LINT_MD_MISC_FILES)
1032+
# Lint other changed markdown files maintained by us
1033+
tools/.miscmdlintstamp: $(LINT_MD_MISC_FILES)
10291034
@echo "Running Markdown linter on misc docs..."
1030-
@$(NODE) tools/remark-cli/cli.js -q -f $(LINT_MD_FILES)
1035+
@$(call available-node,$(run-lint-misc-md))
10311036
@touch $@
10321037

10331038
tools/.mdlintstamp: tools/.miscmdlintstamp tools/.docmdlintstamp

0 commit comments

Comments
 (0)