Join GitHub today
GitHub is home to over 50 million developers working together to host and review code, manage projects, and build software together.
Sign upSwitch back to pinning Rust by Nightly date instead of commit hash… #18325
Conversation
|
@paulrouget Would this help you? |
|
Note that rustup does not automatically install the specified version if it’s missing. Instead it fails with an error like: The fix is to run |
|
So this would add a That would help a lot. At the moment, I have to find manually which rustup nightly match the servo rustc build. |
|
Yes, this PR adds Since version 1.5.0, rustup uses that file to determine which toolchain to use. |
… 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 #11361 Unlike #17927, this does not make mach use rustup directly.
|
@bors-servo r+ |
|
|
|
@bors-servo p=1 The next nightly broke something, I’ll do another rustup on top of this. |
|
|
|
|
|
@bors-servo retry |
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 #11361 Unlike #17927, this does not make mach use rustup directly. That should wait until rust-lang/rustup#1099 is fixed. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/18325) <!-- Reviewable:end -->
|
|
|
Awesome! |
SimonSapin commentedAug 31, 2017
•
edited
… this time using a
rust-toolchainfile compatible with rustup: https://github.com/rust-lang-nursery/rustup.rs/#the-toolchain-fileAnd upgrade to rustc 1.21.0-nightly (c11f689d2 2017-08-29)
Now if both
system-rustandsystem-cargoare set totruein.servobuild’s[tools]section, and the correspondingrustcandcargobinaries are in fact rustup’s wrappers, then rustup will use the correct version based onrust-toolchain.CC #11361
Unlike #17927, this does not make mach use rustup directly. That should wait until rust-lang/rustup#1099 is fixed.
This change is