diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-11-20 20:28:00 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-11-20 20:28:00 +0000 |
| commit | 612a72fc4ea4376920f2a7da7b3c334227c1716c (patch) | |
| tree | 82d4fb25975f01a38977b2f0164b2d7b063bcbc3 /xtask/src | |
| parent | a025303ca686ed3e54164a04319a028931f54284 (diff) | |
| parent | ad2b6cad48dc336011c9fb24ba87b318b796b916 (diff) | |
Merge #2336
2336: Remove npm.cmd r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'xtask/src')
| -rw-r--r-- | xtask/src/main.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 4b1f0c887..c97bfec97 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs | |||
| @@ -173,7 +173,7 @@ fn fix_path_for_mac() -> Result<()> { | |||
| 173 | fn install_client(ClientOpt::VsCode: ClientOpt) -> Result<()> { | 173 | fn install_client(ClientOpt::VsCode: ClientOpt) -> Result<()> { |
| 174 | let npm_version = Cmd { | 174 | let npm_version = Cmd { |
| 175 | unix: r"npm --version", | 175 | unix: r"npm --version", |
| 176 | windows: r"cmd.exe /c npm.cmd --version", | 176 | windows: r"cmd.exe /c npm --version", |
| 177 | work_dir: "./editors/code", | 177 | work_dir: "./editors/code", |
| 178 | } | 178 | } |
| 179 | .run(); | 179 | .run(); |
| @@ -182,10 +182,10 @@ 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.cmd ci", work_dir: "./editors/code" }.run()?; | 185 | Cmd { unix: r"npm ci", windows: r"cmd.exe /c npm ci", work_dir: "./editors/code" }.run()?; |
| 186 | Cmd { | 186 | Cmd { |
| 187 | unix: r"npm run package --scripts-prepend-node-path", | 187 | unix: r"npm run package --scripts-prepend-node-path", |
| 188 | windows: r"cmd.exe /c npm.cmd run package", | 188 | windows: r"cmd.exe /c npm run package", |
| 189 | work_dir: "./editors/code", | 189 | work_dir: "./editors/code", |
| 190 | } | 190 | } |
| 191 | .run()?; | 191 | .run()?; |