mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #3384

Browse Source 
3384: make ci use master rustc instead of nightly r=flip1995 a=matthiaskrgr



Co-authored-by: Matthias Krüger <matthias.krueger@famsik.de>
This commit is contained in:
bors[bot] 2018-10-31 01:29:36 +00:00
commit e695015caa
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.travis.yml
View File

@ -63,8 +63,7 @@ matrix:
- env: INTEGRATION=chronotope/chrono - env: INTEGRATION=chronotope/chrono
- env: INTEGRATION=serde-rs/serde - env: INTEGRATION=serde-rs/serde
- env: INTEGRATION=Geal/nom - 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: allow_failures:
- os: windows - os: windows
env: BASE_TEST=true env: BASE_TEST=true
@ -75,14 +74,13 @@ matrix:
- os: windows - os: windows
script: script:
# uncomment once https://github.com/rust-lang/rust/issues/55376 is fixed - |
# - | rm rust-toolchain
# rm rust-toolchain cargo install rustup-toolchain-install-master || echo "rustup-toolchain-install-master already installed"
# 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}')
# 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
# travis_retry rustup-toolchain-install-master -f -n master $RUSTC_HASH rustup default master
# rustup default master export LD_LIBRARY_PATH=$(rustc --print sysroot)/lib
# export LD_LIBRARY_PATH=$(rustc --print sysroot)/lib
- | - |
if [ -z ${INTEGRATION} ]; then if [ -z ${INTEGRATION} ]; then
./ci/base-tests.sh && sleep 5 ./ci/base-tests.sh && sleep 5

11
appveyor.yml
View File

@ -20,12 +20,11 @@ install:
- set PATH=%PATH%;C:\Users\appveyor\.cargo\bin - 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 - git ls-remote https://github.com/rust-lang/rust.git master | awk '{print $1}' >rustc-hash.txt
- set /p RUSTC_HASH=<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
# - del rust-toolchain - cargo install rustup-toolchain-install-master || echo "rustup-toolchain-install-master already installed"
# - cargo install rustup-toolchain-install-master || echo "rustup-toolchain-install-master already installed" - rustup-toolchain-install-master %RUSTC_HASH% -f -n master
# - rustup-toolchain-install-master %RUSTC_HASH% -f -n master - rustup default master
# - rustup default master - set PATH=%PATH%;C:\Users\appveyor\.rustup\toolchains\master\bin
# - set PATH=%PATH%;C:\Users\appveyor\.rustup\toolchains\master\bin
- rustc -V - rustc -V
- cargo -V - cargo -V