diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-12-02 14:19:12 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-12-02 14:19:12 +0000 |
| commit | c5b322e3df0f3c9d81676bece76bcb76eac6e1ba (patch) | |
| tree | 0dc60f11bbc03168ee6f83cb9f015a6781237ee1 | |
| parent | c6eff1da12478104c86aa4e344c9fc99c18701af (diff) | |
| parent | 1836671d53213e5a1f3cab47fe95e8f6333f2e0f (diff) | |
Merge #2462
2462: Switch back to npm install r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
| -rw-r--r-- | xtask/src/main.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/xtask/src/main.rs b/xtask/src/main.rs index c97bfec97..c52902bb5 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs | |||
| @@ -182,7 +182,8 @@ fn install_client(ClientOpt::VsCode: ClientOpt) -> Result<()> { | |||
| 182 | eprintln!("\nERROR: `npm --version` failed, `npm` is required to build the VS Code plugin") | 182 | eprintln!("\nERROR: `npm --version` failed, `npm` is required to build the VS Code plugin") |
| 183 | } | 183 | } |
| 184 | 184 | ||
| 185 | Cmd { unix: r"npm ci", windows: r"cmd.exe /c npm ci", work_dir: "./editors/code" }.run()?; | 185 | Cmd { unix: r"npm install", windows: r"cmd.exe /c npm install", work_dir: "./editors/code" } |
| 186 | .run()?; | ||
| 186 | Cmd { | 187 | Cmd { |
| 187 | unix: r"npm run package --scripts-prepend-node-path", | 188 | unix: r"npm run package --scripts-prepend-node-path", |
| 188 | windows: r"cmd.exe /c npm run package", | 189 | windows: r"cmd.exe /c npm run package", |