Commit fc1259b
build: use npm ci
* remove obsolete `node_modules/js-yaml/package.json` target
* remove `@touch` since `npm ci` is always destructive
PR-URL: #22399
Refs: #21802
Refs: #21490
Reviewed-By: Tiancheng "Timothy" Gu <timothygu99@gmail.com>
Reviewed-By: Sam Ruby <rubys@intertwingly.net>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Daijiro Wachi <daijiro.wachi@gmail.com>1 parent 0b340ab commit fc1259b
2 files changed
Lines changed: 3 additions & 8 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -642,12 +642,8 @@ out/doc/api/assets/%: doc/api_assets/% out/doc/api/assets | |||
| 642 | 642 | @cp $< $@ | |
| 643 | 643 | ||
| 644 | 644 | ||
| 645 | - run-npm-install = $(PWD)/$(NPM) install --production --no-package-lock | ||
| 646 | 645 | run-npm-ci = $(PWD)/$(NPM) ci | |
| 647 | 646 | ||
| 648 | - tools/doc/node_modules/js-yaml/package.json: | ||
| 649 | - cd tools/doc && $(call available-node,$(run-npm-install)) | ||
| 650 | - | ||
| 651 | 647 | gen-api = tools/doc/generate.js --node-version=$(FULLVERSION) \ | |
| 652 | 648 | --analytics=$(DOCS_ANALYTICS) $< --output-directory=out/doc/api | |
| 653 | 649 | ||
@@ -1074,8 +1070,7 @@ lint-md-build: tools/remark-cli/node_modules \ | |||
| 1074 | 1070 | ||
| 1075 | 1071 | tools/doc/node_modules: tools/doc/package.json | |
| 1076 | 1072 | ifeq ($(node_use_openssl),true) | |
| 1077 | - cd tools/doc && $(call available-node,$(run-npm-install)) | ||
| 1078 | - @touch $@ | ||
| 1073 | + cd tools/doc && $(call available-node,$(run-npm-ci)) | ||
| 1079 | 1074 | else | |
| 1080 | 1075 | @echo "Skipping tools/doc/node_modules (no crypto)" | |
| 1081 | 1076 | endif | |
@@ -1184,7 +1179,7 @@ LINT_CPP_FILES = $(filter-out $(LINT_CPP_EXCLUDE), $(wildcard \ | |||
| 1184 | 1179 | ADDON_DOC_LINT_FLAGS=-whitespace/ending_newline,-build/header_guard | |
| 1185 | 1180 | ||
| 1186 | 1181 | format-cpp-build: | |
| 1187 | - cd tools/clang-format && $(call available-node,$(run-npm-install)) | ||
| 1182 | + cd tools/clang-format && $(call available-node,$(run-npm-ci)) | ||
| 1188 | 1183 | ||
| 1189 | 1184 | format-cpp-clean: | |
| 1190 | 1185 | $(RM) -r tools/clang-format/node_modules | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -439,7 +439,7 @@ if not defined doc ( | |||
| 439 | 439 | if exist "tools\doc\node_modules\unified\package.json" goto skip-install-doctools | |
| 440 | 440 | SETLOCAL | |
| 441 | 441 | cd tools\doc | |
| 442 | - %npm_exe% install | ||
| 442 | + %npm_exe% ci | ||
| 443 | 443 | cd ..\.. | |
| 444 | 444 | if errorlevel 1 goto exit | |
| 445 | 445 | ENDLOCAL | |
0 commit comments