Skip to content

Add setup-toolchain.sh script to configure the master version of rustc, #3735

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 4, 2019

Conversation

jsgf
Copy link
Contributor

@jsgf jsgf commented Feb 2, 2019

and update CONTRIBUTING.md accordingly.

@jsgf
Copy link
Contributor Author

jsgf commented Feb 2, 2019

Not sure if this is actually correct, but it unblocked me. I stole the logic from .travis.yml, so maybe it should just use this script.

cargo install rustup-toolchain-install-master --debug || echo "rustup-toolchain-install-master already installed"
RUSTC_HASH=$(git ls-remote https://github.com/rust-lang/rust.git master | awk '{print $1}')
rustup-toolchain-install-master -f -n master $RUSTC_HASH
rustup override set master
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

newline at eof please

@Manishearth
Copy link
Member

LGTM, feel free to make travis use it

@jsgf jsgf force-pushed the setup-toolchain branch 3 times, most recently from 5076b90 to 8a7db0f Compare February 3, 2019 03:26
@phansch
Copy link
Member

phansch commented Feb 3, 2019

Failure should be fixed with #3736, going to retrigger the build

@phansch phansch closed this Feb 3, 2019
@phansch phansch reopened this Feb 3, 2019
@phansch
Copy link
Member

phansch commented Feb 3, 2019

I think you'll also have to change

rustup default nightly

and

rustup default master

to use override set nightly/master because the override takes priority over the default toolchain.

@jsgf
Copy link
Contributor Author

jsgf commented Feb 3, 2019

OK, updated.

@Manishearth Manishearth merged commit 7bea436 into rust-lang:master Feb 4, 2019
@Manishearth
Copy link
Member

thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants