diff options
| author | bors <bors@rust-lang.org> | 2019-10-12 06:00:52 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-10-12 06:00:52 +0000 |
| commit | 4d0e89739412c6ddd8cc97c9de3d142da6fa9f10 (patch) | |
| tree | 4ddb9a6c90cb456f1ba88b3027baf6050cc5398e | |
| parent | 5317efb8b5fb24a01bbb1c2f61833792dd751182 (diff) | |
| parent | 83f04442ecb50441dff764f9bb05ad89656891f1 (diff) | |
| download | rust-4d0e89739412c6ddd8cc97c9de3d142da6fa9f10.tar.gz rust-4d0e89739412c6ddd8cc97c9de3d142da6fa9f10.zip | |
Auto merge of #4654 - lzutao:rustc-dev, r=phansch
Rustup for rustc-dev cc https://github.com/rust-lang/rust/pull/64823 Closes #4651 changelog: none
| -rw-r--r-- | CONTRIBUTING.md | 2 | ||||
| -rw-r--r-- | appveyor.yml | 6 | ||||
| -rwxr-xr-x | setup-toolchain.sh | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index bf681a49b98..fcf984ccaaf 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -147,7 +147,7 @@ You can use [rustup-toolchain-install-master][rtim] to do that: ```bash cargo install rustup-toolchain-install-master -rustup-toolchain-install-master -n master --force +rustup-toolchain-install-master --force -n master -c rustc-dev rustup override set master cargo test ``` diff --git a/appveyor.yml b/appveyor.yml index eabb5ac5bf9..93bb8bde7d2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -17,11 +17,9 @@ install: - curl -sSf -o rustup-init.exe https://win.rustup.rs/ - rustup-init.exe -y --default-host %TARGET% --default-toolchain nightly - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin - - git ls-remote https://github.com/rust-lang/rust.git master | awk '{print $1}' >rustc-hash.txt - - set /p RUSTC_HASH=<rustc-hash.txt - del rust-toolchain - - cargo install rustup-toolchain-install-master --debug || echo "rustup-toolchain-install-master already installed" - - rustup-toolchain-install-master %RUSTC_HASH% -f -n master + - cargo install --git https://github.com/kennytm/rustup-toolchain-install-master --debug || echo "rustup-toolchain-install-master already installed" + - rustup-toolchain-install-master -f -n master -c rustc-dev - rustup component add rustfmt --toolchain nightly & exit 0 # Format test handles missing rustfmt - rustup default master - set PATH=%PATH%;C:\Users\appveyor\.rustup\toolchains\master\bin diff --git a/setup-toolchain.sh b/setup-toolchain.sh index c1c8366bf5e..012d26a1046 100755 --- a/setup-toolchain.sh +++ b/setup-toolchain.sh @@ -1,12 +1,14 @@ #!/bin/bash # Set up the appropriate rustc toolchain -cd "$(dirname "$0")" +cd "$(dirname "$0")" || exit if ! command -v rustup-toolchain-install-master > /dev/null; then - cargo install rustup-toolchain-install-master --debug + cargo install \ + --git https://github.com/kennytm/rustup-toolchain-install-master \ + --bin rustup-toolchain-install-master \ + --debug fi -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-toolchain-install-master -f -n master -c rustc-dev rustup override set master |