Merge remote-tracking branch 'phansch/disable_master_build' into temp_breakage_fix

This commit is contained in:
Matthias Krüger 2018-10-28 16:55:33 +01:00
commit 9a1bb7bcf8

View file

@ -75,13 +75,14 @@ matrix:
- os: windows
script:
- |
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
# 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
- |
if [ -z ${INTEGRATION} ]; then
./ci/base-tests.sh && sleep 5