Commit 999a289
tools: fix race condition when npm installing
The update scripts that install dependencies from npm blindly assume
that `npm install` will always install the version that was previously
fetched as `dist-tags.latest`. That is not necessarily true, so instead
always install the specific version that the script thinks is current.
PR-URL: #48101
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
Reviewed-By: Darshan Sen <raisinten@gmail.com>
Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com>
Reviewed-By: Mestery <mestery@protonmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>1 parent 25b0033 commit 999a289
7 files changed
Lines changed: 7 additions & 7 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -33,7 +33,7 @@ rm -rf deps/acorn/acorn-walk | |||
| 33 | 33 | ||
| 34 | 34 | "$NODE" "$NPM" init --yes | |
| 35 | 35 | ||
| 36 | - "$NODE" "$NPM" install --global-style --no-bin-links --ignore-scripts acorn-walk | ||
| 36 | + "$NODE" "$NPM" install --global-style --no-bin-links --ignore-scripts "acorn-walk@$NEW_VERSION" | ||
| 37 | 37 | ) | |
| 38 | 38 | ||
| 39 | 39 | mv acorn-walk-tmp/node_modules/acorn-walk deps/acorn | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -33,7 +33,7 @@ rm -rf deps/acorn/acorn | |||
| 33 | 33 | ||
| 34 | 34 | "$NODE" "$NPM" init --yes | |
| 35 | 35 | ||
| 36 | - "$NODE" "$NPM" install --global-style --no-bin-links --ignore-scripts acorn | ||
| 36 | + "$NODE" "$NPM" install --global-style --no-bin-links --ignore-scripts "acorn@$NEW_VERSION" | ||
| 37 | 37 | cd node_modules/acorn | |
| 38 | 38 | # update this version information in src/acorn_version.h | |
| 39 | 39 | FILE_PATH="$ROOT/src/acorn_version.h" | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -44,7 +44,7 @@ cd "$WORKSPACE" | |||
| 44 | 44 | ||
| 45 | 45 | "$NODE" "$NPM" init --yes | |
| 46 | 46 | ||
| 47 | - "$NODE" "$NPM" install --global-style --no-bin-links --ignore-scripts cjs-module-lexer | ||
| 47 | + "$NODE" "$NPM" install --global-style --no-bin-links --ignore-scripts "cjs-module-lexer@$NEW_VERSION" | ||
| 48 | 48 | ||
| 49 | 49 | rm -rf "$DEPS_DIR/cjs-module-lexer" | |
| 50 | 50 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -36,7 +36,7 @@ rm -rf ../node_modules/eslint | |||
| 36 | 36 | --ignore-scripts \ | |
| 37 | 37 | --install-strategy=shallow \ | |
| 38 | 38 | --no-bin-links \ | |
| 39 | - eslint | ||
| 39 | + "eslint@$NEW_VERSION" | ||
| 40 | 40 | # Uninstall plugins that we want to install so that they are removed from | |
| 41 | 41 | # devDependencies. Otherwise --omit=dev will cause them to be skipped. | |
| 42 | 42 | ( | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -34,7 +34,7 @@ rm -rf deps/minimatch/index.js | |||
| 34 | 34 | ||
| 35 | 35 | "$NODE" "$NPM" init --yes | |
| 36 | 36 | ||
| 37 | - "$NODE" "$NPM" install --global-style --no-bin-links --ignore-scripts minimatch | ||
| 37 | + "$NODE" "$NPM" install --global-style --no-bin-links --ignore-scripts "minimatch@$NEW_VERSION" | ||
| 38 | 38 | cd node_modules/minimatch | |
| 39 | 39 | "$NODE" "$NPM" exec --package=esbuild@0.17.15 --yes -- esbuild ./dist/cjs/index.js --bundle --platform=node --outfile=minimatch.js | |
| 40 | 40 | ) | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -29,7 +29,7 @@ cd test/fixtures/postject-copy || exit | |||
| 29 | 29 | ||
| 30 | 30 | "$NODE" "$NPM" init --yes | |
| 31 | 31 | ||
| 32 | - "$NODE" "$NPM" install --no-bin-links --ignore-scripts postject | ||
| 32 | + "$NODE" "$NPM" install --no-bin-links --ignore-scripts "postject@$NEW_VERSION" | ||
| 33 | 33 | ||
| 34 | 34 | # TODO(RaisinTen): Replace following with $WORKSPACE | |
| 35 | 35 | cd ../../.. | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -33,7 +33,7 @@ rm -f deps/undici/undici.js | |||
| 33 | 33 | ||
| 34 | 34 | "$NODE" "$NPM" init --yes | |
| 35 | 35 | ||
| 36 | - "$NODE" "$NPM" install --global-style --no-bin-links --ignore-scripts undici | ||
| 36 | + "$NODE" "$NPM" install --global-style --no-bin-links --ignore-scripts "undici@$NEW_VERSION" | ||
| 37 | 37 | cd node_modules/undici | |
| 38 | 38 | "$NODE" "$NPM" run build:node | |
| 39 | 39 | # update this version information in src/undici_version.h | |
0 commit comments