Ensure correct toolchain per clone. #6054
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Previously, if the Rust toolchain was changed, re-bootstrapping would proceed correctly in the first clone encountering the change but it would fail in other clones. Ensure the correct toolchain is set when building the symlink farm (but not needing to bootstrap the toolchain) to cover this case.
…tions of the toolchain are not or are corrupt.
jsirois
force-pushed
the
rust_toolchain/fix_multi_clone_use_case
branch
from
3c6071d
to
8caa0f7
Compare
|
Went a bit further here and did it really right. Probably worth another look. |
stuhood
approved these changes
Jun 29, 2018
| function set_rust_toolchain() { | ||
| ( | ||
| cd "${REPO_ROOT}" | ||
| "${RUSTUP}" override set "${RUST_TOOLCHAIN}" >&2 |
There was a problem hiding this comment.
Would it be more explicit to use the rust-toolchain file: https://github.com/rust-lang-nursery/rustup.rs#the-toolchain-file ?
There was a problem hiding this comment.
I think so. Good idea.
This seals the current repo Rust toolchain version in a standard discoverable place. Also rename `bootstrap_rust.sh`'s exported function to reflect what it actually now does.
This apparently needs to re-bootstrap the native engine binary and supporting changes to test infra were needed to ensure the new rust-toolchain file was available in the test buildroot as result.
baroquebobcat
approved these changes
Jun 29, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously, if the Rust toolchain was changed, re-bootstrapping would
proceed correctly in the first clone encountering the change but it
would fail in other clones. Ensure the correct toolchain is set when
building the symlink farm (but not needing to bootstrap the toolchain)
to cover this case.