Skip to content

Commit a7464b2

Browse files
committed
Roll back libc in the ci scripts too
1 parent d354559 commit a7464b2

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

ci/rustup.sh

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,15 @@
44

55
set -ex
66

7-
for toolchain in 1.8.0 1.15.0 beta nightly; do
8-
run="rustup run $toolchain"
7+
export TRAVIS_RUST_VERSION
8+
for TRAVIS_RUST_VERSION in 1.8.0 1.15.0 beta nightly; do
9+
run="rustup run $TRAVIS_RUST_VERSION"
10+
if [ "$TRAVIS_RUST_VERSION" = 1.8.0 ]; then
11+
# libc 0.2.34 started using #[deprecated]
12+
$run cargo generate-lockfile
13+
$run cargo update --package libc --precise 0.2.33 || :
14+
fi
915
$run cargo build --verbose
10-
$run $PWD/ci/test_full.sh $toolchain
16+
$run $PWD/ci/test_full.sh
1117
$run cargo doc
1218
done

ci/test_full.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,15 @@
22

33
set -ex
44

5-
echo Testing num on rustc ${TRAVIS_RUST_VERSION:=$1}
5+
echo Testing num on rustc ${TRAVIS_RUST_VERSION}
66

77
# All of these packages should build and test everywhere.
88
for package in bigint complex integer iter rational traits; do
9+
if [ "$TRAVIS_RUST_VERSION" = 1.8.0 ]; then
10+
# libc 0.2.34 started using #[deprecated]
11+
cargo generate-lockfile --manifest-path $package/Cargo.toml
12+
cargo update --manifest-path $package/Cargo.toml --package libc --precise 0.2.33 || :
13+
fi
914
cargo build --manifest-path $package/Cargo.toml
1015
cargo test --manifest-path $package/Cargo.toml
1116
done

0 commit comments

Comments
 (0)