Skip to content

Commit ce1eb0b

Browse files
joyeecheungevanlucas
authored andcommitted
build: make lint-md independent of local node
PR-URL: #18272 Reviewed-By: Gibson Fahnestock <[email protected]> Reviewed-By: James M Snell <[email protected]>
1 parent b055c9e commit ce1eb0b

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
@@ -1038,27 +1038,32 @@ lint-md-clean:
10381038
lint-md-build:
10391039
@if [ ! -d tools/remark-cli/node_modules ]; then \
10401040
echo "Markdown linter: installing remark-cli into tools/"; \
1041-
cd tools/remark-cli && ../../$(NODE) ../../$(NPM) install; fi
1041+
cd tools/remark-cli && $(call available-node,$(run-npm-install)) fi
10421042
@if [ ! -d tools/remark-preset-lint-node/node_modules ]; then \
10431043
echo "Markdown linter: installing remark-preset-lint-node into tools/"; \
1044-
cd tools/remark-preset-lint-node && ../../$(NODE) ../../$(NPM) install; fi
1044+
cd tools/remark-preset-lint-node && $(call available-node,$(run-npm-install)) fi
1045+
10451046

10461047
.PHONY: lint-md
10471048
ifneq ("","$(wildcard tools/remark-cli/node_modules/)")
1048-
LINT_MD_TARGETS = src lib benchmark tools/doc tools/icu
1049-
LINT_MD_ROOT_DOCS := $(wildcard *.md)
1050-
LINT_MD_FILES := $(shell find $(LINT_MD_TARGETS) -type f \
1051-
-not -path '*node_modules*' -name '*.md') $(LINT_MD_ROOT_DOCS)
1052-
LINT_DOC_MD_FILES = $(shell ls doc/**/*.md)
10531049

1054-
tools/.docmdlintstamp: $(LINT_DOC_MD_FILES)
1050+
LINT_MD_DOC_FILES = $(shell ls doc/**/*.md)
1051+
run-lint-doc-md = tools/remark-cli/cli.js -q -f $(LINT_MD_DOC_FILES)
1052+
# Lint all changed markdown files under doc/
1053+
tools/.docmdlintstamp: $(LINT_MD_DOC_FILES)
10551054
@echo "Running Markdown linter on docs..."
1056-
@$(NODE) tools/remark-cli/cli.js -q -f $(LINT_DOC_MD_FILES)
1055+
@$(call available-node,$(run-lint-doc-md))
10571056
@touch $@
10581057

1059-
tools/.miscmdlintstamp: $(LINT_MD_FILES)
1058+
LINT_MD_TARGETS = src lib benchmark tools/doc tools/icu
1059+
LINT_MD_ROOT_DOCS := $(wildcard *.md)
1060+
LINT_MD_MISC_FILES := $(shell find $(LINT_MD_TARGETS) -type f \
1061+
-not -path '*node_modules*' -name '*.md') $(LINT_MD_ROOT_DOCS)
1062+
run-lint-misc-md = tools/remark-cli/cli.js -q -f $(LINT_MD_MISC_FILES)
1063+
# Lint other changed markdown files maintained by us
1064+
tools/.miscmdlintstamp: $(LINT_MD_MISC_FILES)
10601065
@echo "Running Markdown linter on misc docs..."
1061-
@$(NODE) tools/remark-cli/cli.js -q -f $(LINT_MD_FILES)
1066+
@$(call available-node,$(run-lint-misc-md))
10621067
@touch $@
10631068

10641069
tools/.mdlintstamp: tools/.miscmdlintstamp tools/.docmdlintstamp

0 commit comments

Comments
 (0)