diff options
| -rw-r--r-- | .appveyor.yml | 22 | ||||
| -rw-r--r-- | .travis.yml | 2 |
2 files changed, 6 insertions, 18 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 2bec8a042..c63670618 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -283,22 +283,8 @@ install: # Add Rust/Cargo to PATH. - ps: $env:PATH += ";$env:CARGO_HOME\bin" - # Look for Rust updates. - # * If there are no updates, rustup will exit cleanly. - # * If there are updates, rustup will attempt to install them, and then blow - # up because we removed the 'rust-docs' component. - # * The actual update is done by removing and reinstalling with rustup-init. - - ps: |- - if (Get-SaveCache -and (Test-Path $env:CARGO_HOME)) { - try { - Exec -NoNewLines { & rustup update stable-x86_64-pc-windows-msvc } - } catch { - Delete-Tree $env:CARGO_HOME, $env:RUSTUP_HOME - } - } - - # Install or reinstall Rust via rustup-init. - # * After install/update, the rustup directory is very big, with many files, + # Install Rust via rustup-init. + # * After install, the rustup directory is very big, with many files, # slowing down cache save/restore a lot, so we remove unnecessary stuff. # * TODO: Use `rustup component remove docs` instead, when this issue # is resolved: https://github.com/rust-lang-nursery/rustup.rs/issues/998. @@ -307,7 +293,9 @@ install: if (-not (Test-Path $env:CARGO_HOME)) { Invoke-WebRequest -Uri "https://win.rustup.rs" ` -OutFile "$env:TEMP\rustup-init.exe" - Exec -NoNewLines { & "$env:TEMP\rustup-init.exe" -y } + Exec -NoNewLines { + & "$env:TEMP\rustup-init.exe" -y --default-toolchain 1.30.0 + } Delete-Tree @( "$env:RUSTUP_HOME\downloads", "$env:RUSTUP_HOME\tmp", diff --git a/.travis.yml b/.travis.yml index a61d5afab..ff4e0c211 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,7 +56,7 @@ install: # TODO(ry) Include rustc in third_party. # https://github.com/denoland/deno/issues/386 if [ ! $(which rustc) ]; then - curl -sSf https://sh.rustup.rs | sh -s -- -y + curl -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.30.0 fi rustc --version cargo --version |