Skip to content

Commit 0e31f3c

Browse files
committed
Merge #345
345: Downgrade libc for Rust 1.8 CI r=cuviper a=cuviper
2 parents cc3be86 + a7464b2 commit 0e31f3c

File tree

3 files changed

+22
-5
lines changed

3 files changed

+22
-5
lines changed

.travis.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
11
language: rust
22
rust:
3-
- 1.8.0
43
- 1.15.0
54
- beta
65
- nightly
6+
matrix:
7+
include:
8+
- rust: 1.8.0
9+
before_script:
10+
# libc 0.2.34 started using #[deprecated]
11+
- cargo generate-lockfile
12+
- cargo update --package libc --precise 0.2.33
713
sudo: false
814
script:
915
- cargo build --verbose

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)