diff options
author | Seivan Heidari <[email protected]> | 2019-12-23 14:35:31 +0000 |
---|---|---|
committer | Seivan Heidari <[email protected]> | 2019-12-23 14:35:31 +0000 |
commit | b21d9337d9200e2cfdc90b386591c72c302dc03e (patch) | |
tree | f81f5c08f821115cee26fa4d3ceaae88c7807fd5 /xtask/src/main.rs | |
parent | 18a0937585b836ec5ed054b9ae48e0156ab6d9ef (diff) | |
parent | ce07a2daa9e53aa86a769f8641b14c2878444fbc (diff) |
Merge branch 'master' into feature/themes
Diffstat (limited to 'xtask/src/main.rs')
-rw-r--r-- | xtask/src/main.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/xtask/src/main.rs b/xtask/src/main.rs index c97bfec97..4201c6a6a 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs | |||
@@ -20,7 +20,7 @@ use xtask::{ | |||
20 | }; | 20 | }; |
21 | 21 | ||
22 | // Latest stable, feel free to send a PR if this lags behind. | 22 | // Latest stable, feel free to send a PR if this lags behind. |
23 | const REQUIRED_RUST_VERSION: u32 = 39; | 23 | const REQUIRED_RUST_VERSION: u32 = 40; |
24 | 24 | ||
25 | struct InstallOpt { | 25 | struct InstallOpt { |
26 | client: Option<ClientOpt>, | 26 | client: Option<ClientOpt>, |
@@ -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", |