diff options
| author | Jeremy Fitzhardinge <jeremy@goop.org> | 2019-02-02 11:54:18 -0800 |
|---|---|---|
| committer | Jeremy Fitzhardinge <jeremy@goop.org> | 2019-02-03 14:41:46 -0800 |
| commit | 47563a13eba19d0fc4b56f2cd0d5645fc81e7bc3 (patch) | |
| tree | 7022ad23287e1ba009bcc59fa43682546f79799b /ci | |
| parent | 27b5dd8886ac0423e059c0817b55a4e618b344a0 (diff) | |
| download | rust-47563a13eba19d0fc4b56f2cd0d5645fc81e7bc3.tar.gz rust-47563a13eba19d0fc4b56f2cd0d5645fc81e7bc3.zip | |
Add setup-toolchain.sh script to configure the master version of rustc,
and update CONTRIBUTING.md accordingly.
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/base-tests.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ci/base-tests.sh b/ci/base-tests.sh index 6675c795b3b..3ac6bbe6725 100755 --- a/ci/base-tests.sh +++ b/ci/base-tests.sh @@ -29,7 +29,7 @@ cargo +nightly fmt --all -- --check # some lints are sensitive to formatting, exclude some files tests_need_reformatting="false" # switch to nightly -rustup default nightly +rustup override set nightly # avoid loop spam and allow cmds with exit status != 0 set +ex @@ -49,4 +49,4 @@ if [ "${tests_need_reformatting}" == "true" ] ; then fi # switch back to master -rustup default master +rustup override set master |