From d354559365412a96b1ec55e17f4356268f54d724 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Thu, 30 Nov 2017 16:15:45 -0800 Subject: [PATCH 1/2] Downgrade libc for Rust 1.8 CI --- .travis.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3e44b2e..c8195a7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,15 @@ language: rust rust: - - 1.8.0 - 1.15.0 - beta - nightly +matrix: + include: + - rust: 1.8.0 + before_script: + # libc 0.2.34 started using #[deprecated] + - cargo generate-lockfile + - cargo update --package libc --precise 0.2.33 sudo: false script: - cargo build --verbose From a7464b2b4259039ded23a14b642db199e0321294 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Thu, 30 Nov 2017 17:01:09 -0800 Subject: [PATCH 2/2] Roll back libc in the ci scripts too --- ci/rustup.sh | 12 +++++++++--- ci/test_full.sh | 7 ++++++- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/ci/rustup.sh b/ci/rustup.sh index f263dd8..b415aa2 100755 --- a/ci/rustup.sh +++ b/ci/rustup.sh @@ -4,9 +4,15 @@ set -ex -for toolchain in 1.8.0 1.15.0 beta nightly; do - run="rustup run $toolchain" +export TRAVIS_RUST_VERSION +for TRAVIS_RUST_VERSION in 1.8.0 1.15.0 beta nightly; do + run="rustup run $TRAVIS_RUST_VERSION" + if [ "$TRAVIS_RUST_VERSION" = 1.8.0 ]; then + # libc 0.2.34 started using #[deprecated] + $run cargo generate-lockfile + $run cargo update --package libc --precise 0.2.33 || : + fi $run cargo build --verbose - $run $PWD/ci/test_full.sh $toolchain + $run $PWD/ci/test_full.sh $run cargo doc done diff --git a/ci/test_full.sh b/ci/test_full.sh index 9a0f2cf..8576e94 100755 --- a/ci/test_full.sh +++ b/ci/test_full.sh @@ -2,10 +2,15 @@ set -ex -echo Testing num on rustc ${TRAVIS_RUST_VERSION:=$1} +echo Testing num on rustc ${TRAVIS_RUST_VERSION} # All of these packages should build and test everywhere. for package in bigint complex integer iter rational traits; do + if [ "$TRAVIS_RUST_VERSION" = 1.8.0 ]; then + # libc 0.2.34 started using #[deprecated] + cargo generate-lockfile --manifest-path $package/Cargo.toml + cargo update --manifest-path $package/Cargo.toml --package libc --precise 0.2.33 || : + fi cargo build --manifest-path $package/Cargo.toml cargo test --manifest-path $package/Cargo.toml done