Skip to content

Commit 3b7b15d

Browse files
committed
testing: docker tests now work on travis
All of the platforms tested currently fail in some way currently, but the infrastructure itself appears to be working. As we have moved to the legacy infrastructure (required in order to use docker), the tests do run slower now. To compensate for that, i686 builds are only done on stable and we do not test every version between the current stable and the oldest version we support. Signed-off-by: Paul Osborne <[email protected]>
1 parent 6ad81d1 commit 3b7b15d

File tree

2 files changed

+21
-14
lines changed

2 files changed

+21
-14
lines changed

.travis.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
1-
---
1+
language: rust
22
sudo: required
3+
dist: trusty
34
services:
45
- docker
5-
language: rust
6+
67
rust:
78
- 1.1.0 # Oldest supported version
8-
- 1.2.0
9-
- 1.3.0
10-
- 1.4.0
11-
- 1.5.0
12-
- 1.6.0
13-
- 1.7.0
149
- stable
1510
- beta
1611
- nightly
1712

1813
script:
19-
- sh ci/run-travis.sh
14+
- bash ci/run-travis.sh
15+
16+
env:
17+
- ARCH=x86_64
2018

2119
os:
2220
- linux
2321
- osx
2422

25-
env:
26-
- ARCH=x86_64
27-
- ARCH=i686
28-
2923
# Failures on nightly shouldn't fail the overall build.
3024
matrix:
3125
fast_finish: true
3226
include:
27+
- os: linux
28+
env: ARCH=i686
29+
rust: stable
30+
- os: osx
31+
env: ARCH=i686
32+
rust: stable
3333
- os: linux
3434
env: TARGET=aarch64-unknown-linux-gnu DOCKER_IMAGE=posborne/rust-cross:arm
3535
rust: 1.7.0

ci/run-travis.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,15 @@ if [ "$TARGET" = "" ]; then
2727
TARGET=$HOST
2828
fi
2929

30+
if [ "$TARGET" = "i686-unknown-linux-gnu" ]; then
31+
sudo apt-get -y update
32+
sudo apt-get install -y gcc-multilib
33+
fi
34+
3035
if [ "$DOCKER_IMAGE" = "" ]; then
31-
RUST_TEST_THREADS=1 cargo test
36+
export RUST_TEST_THREADS=1
37+
curl -sSL "https://raw.githubusercontent.com/carllerche/travis-rust-matrix/master/test" | bash
38+
cargo doc --no-deps
3239
else
3340
export RUST_VERSION=${TRAVIS_RUST_VERSION}
3441
export RUST_TARGET=${TARGET}

0 commit comments

Comments
 (0)