Skip to content

Reenable master build, unbreak CI #3383

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Reenable master build, unbreak CI #3383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
language: rust

rust: nightly
# change to nightly when https://github.com/rust-lang/rust/issues/55376 is fixed
rust: nightly-2018-10-20

os:
- linux
Expand Down Expand Up @@ -75,14 +76,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
Expand Down
22 changes: 11 additions & 11 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@ branches:
- staging.tmp

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
# 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
- curl -sSf -o rustup-init.exe https://win.rustup.rs/
# change to nightly when https://github.com/rust-lang/rust/issues/55376 is fixed
- rustup-init.exe -y --default-host %TARGET% --default-toolchain nightly-2018-10-20
- 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 || 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

Expand Down