diff options
| author | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-10-31 01:29:36 +0000 |
|---|---|---|
| committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-10-31 01:29:36 +0000 |
| commit | e695015caa8223abd1b49dc74f1e34b591a2f438 (patch) | |
| tree | 6233d0ded552bfef64443418edbae1a20cbd95f5 | |
| parent | 481f7880df428020480eb343c209072c6db10503 (diff) | |
| parent | 9f722e97592d51593f3e63487ce350ae801a89cf (diff) | |
| download | rust-e695015caa8223abd1b49dc74f1e34b591a2f438.tar.gz rust-e695015caa8223abd1b49dc74f1e34b591a2f438.zip | |
Merge #3384
3384: make ci use master rustc instead of nightly r=flip1995 a=matthiaskrgr Co-authored-by: Matthias Krüger <matthias.krueger@famsik.de>
| -rw-r--r-- | .travis.yml | 18 | ||||
| -rw-r--r-- | appveyor.yml | 11 |
2 files changed, 13 insertions, 16 deletions
diff --git a/.travis.yml b/.travis.yml index d3f8c116607..75b45c9db40 100644 --- a/.travis.yml +++ b/.travis.yml @@ -63,8 +63,7 @@ matrix: - env: INTEGRATION=chronotope/chrono - env: INTEGRATION=serde-rs/serde - env: INTEGRATION=Geal/nom -# uncomment once https://github.com/rust-lang/rust/issues/55376 is fixed -# - env: INTEGRATION=hyperium/hyper + - env: INTEGRATION=hyperium/hyper allow_failures: - os: windows env: BASE_TEST=true @@ -75,14 +74,13 @@ matrix: - os: windows script: - # uncomment once https://github.com/rust-lang/rust/issues/55376 is fixed - # - | - # rm rust-toolchain - # cargo install rustup-toolchain-install-master || echo "rustup-toolchain-install-master already installed" - # RUSTC_HASH=$(git ls-remote https://github.com/rust-lang/rust.git master | awk '{print $1}') - # travis_retry rustup-toolchain-install-master -f -n master $RUSTC_HASH - # rustup default master - # export LD_LIBRARY_PATH=$(rustc --print sysroot)/lib + - | + rm rust-toolchain + cargo install rustup-toolchain-install-master || echo "rustup-toolchain-install-master already installed" + RUSTC_HASH=$(git ls-remote https://github.com/rust-lang/rust.git master | awk '{print $1}') + travis_retry rustup-toolchain-install-master -f -n master $RUSTC_HASH + rustup default master + export LD_LIBRARY_PATH=$(rustc --print sysroot)/lib - | if [ -z ${INTEGRATION} ]; then ./ci/base-tests.sh && sleep 5 diff --git a/appveyor.yml b/appveyor.yml index 18f25e916f3..fb0b326c713 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -20,12 +20,11 @@ install: - 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 -# uncomment once https://github.com/rust-lang/rust/issues/55376 is fixed -# - del rust-toolchain -# - cargo install rustup-toolchain-install-master || echo "rustup-toolchain-install-master already installed" -# - rustup-toolchain-install-master %RUSTC_HASH% -f -n master -# - rustup default master -# - set PATH=%PATH%;C:\Users\appveyor\.rustup\toolchains\master\bin + - del rust-toolchain + - cargo install rustup-toolchain-install-master || echo "rustup-toolchain-install-master already installed" + - rustup-toolchain-install-master %RUSTC_HASH% -f -n master + - rustup default master + - set PATH=%PATH%;C:\Users\appveyor\.rustup\toolchains\master\bin - rustc -V - cargo -V |