Skip to content

Commit 66bc5a4

Browse files
committed
Auto merge of #148763 - yotamofek:use-yarn, r=Kobzol
Use `yarn` instead of `npm` for JS/TS dependencies Building on `@lolbinarycat` 's excellent work ( #148672 ). `npm` apparently has certain edge-cases where it doesn't actually respect the lockfile it's fed, which has led to at least one [CI breakage](https://rust-lang.zulipchat.com/#narrow/channel/242791-t-infra/topic/CI.20keeps.20failing.20because.20of.20npm.20error/near/554420543). `yarn` seems to not suffer from those same issues, and also has a `--frozen` flag for its `install` command
2 parents cc328c1 + 58f034f commit 66bc5a4

File tree

18 files changed

+1687
-2881
lines changed

18 files changed

+1687
-2881
lines changed

REUSE.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ path = [
3838
"triagebot.toml",
3939
"typos.toml",
4040
"package.json",
41-
"package-lock.json",
41+
"yarn.lock",
4242
"x",
4343
"x.ps1",
4444
"x.py",

bootstrap.example.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -315,12 +315,12 @@
315315
# target when running tests, otherwise this can be omitted.
316316
#build.nodejs = "node"
317317

318-
# The npm executable to use. Note that this is used for rustdoc-gui tests,
319-
# otherwise this can be omitted.
318+
# The yarn executable to use. Note that this is used for rustdoc-gui tests and
319+
# tidy js extra-checks, otherwise this can be omitted.
320320
#
321-
# Under Windows this should be `npm.cmd` or path to it (verified on nodejs v18.06), or
321+
# Under Windows this should be `yarn.cmd` or path to it (verified on nodejs v18.06), or
322322
# error will be emitted.
323-
#build.npm = "npm"
323+
#build.yarn = "yarn"
324324

325325
# Python interpreter to use for various tasks throughout the build, notably
326326
# rustdoc tests, and some dist bits and pieces.

0 commit comments

Comments
 (0)