diff options
| author | Simon Sapin <simon.sapin@exyr.org> | 2017-08-31 11:17:33 +0200 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2017-08-31 14:30:28 +0200 |
| commit | 56b4f3ae70a217834f88a4233eb9989ff9cfec92 (patch) | |
| tree | 4abd8e7eef44d83185a17854952f4c9ca514be73 /appveyor.yml | |
| parent | d795ceae17b2ce5346d4f211f73c62e5c25dce79 (diff) | |
| download | servo-56b4f3ae70a217834f88a4233eb9989ff9cfec92.tar.gz servo-56b4f3ae70a217834f88a4233eb9989ff9cfec92.zip | |
Switch back to pinning Rust by Nightly date instead of commit hash…
… this time using a `rust-toolchain` file compatible with rustup:
https://github.com/rust-lang-nursery/rustup.rs/#the-toolchain-file
And upgrade to rustc 1.21.0-nightly (c11f689d2 2017-08-29)
----
Now if both `system-rust` and `system-cargo` are set to `true` in `.servobuild`’s `[tools]` section,
and the corresponding `rustc` and `cargo` binaries are in fact rustup’s wrappers,
then rustup will use the correct version based on `rust-toolchain`.
CC https://github.com/servo/servo/issues/11361
Unlike https://github.com/servo/servo/pull/17927,
this does not make mach use rustup directly.
Diffstat (limited to 'appveyor.yml')
| -rw-r--r-- | appveyor.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/appveyor.yml b/appveyor.yml index b648da06876..80d31ea69b9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -36,8 +36,8 @@ branches: - master cache: - - .servo -> rust-commit-hash - - .cargo -> rust-commit-hash + - .servo -> rust-toolchain + - .cargo -> rust-toolchain - .ccache # Uncomment these lines to expose RDP access information to the build machine in the build log. |