Skip to content

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

Merged
Manishearth merged 1 commit into
rust-lang:masterfrom
jsgf:setup-toolchain
Feb 4, 2019
Merged

Add setup-toolchain.sh script to configure the master version of rustc,#3735
Manishearth merged 1 commit into
rust-lang:masterfrom
jsgf:setup-toolchain

Conversation

@jsgf

@jsgf jsgf commented Feb 2, 2019

Copy link
Copy Markdown
Contributor

and update CONTRIBUTING.md accordingly.

@jsgf

jsgf commented Feb 2, 2019

Copy link
Copy Markdown
Contributor Author

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.

Comment thread setup-toolchain.sh Outdated
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 No newline at end of file

Copy link
Copy Markdown
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
Copy Markdown
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

phansch commented Feb 3, 2019

Copy link
Copy Markdown
Contributor

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

phansch commented Feb 3, 2019

Copy link
Copy Markdown
Contributor

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

jsgf commented Feb 3, 2019

Copy link
Copy Markdown
Contributor Author

OK, updated.

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

Copy link
Copy Markdown
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