Skip to content

Commit a6967d6

Browse files
committed
travis: add back testing on all rust versions (for linux)
We are using containers for a majority of builds again, so perform those builds on more platforms (as travis seems to handle this much better). For OSX, we now testing i686/x86_64 on 1.1.0 as well for added coverage. Signed-off-by: Paul Osborne <osbpau@gmail.com>
1 parent ec47022 commit a6967d6

File tree

2 files changed

+21
-10
lines changed

2 files changed

+21
-10
lines changed

.travis.yml

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ services:
66

77
rust:
88
- 1.1.0 # Oldest supported version
9+
- 1.2.0
10+
- 1.3.0
11+
- 1.4.0
12+
- 1.5.0
13+
- 1.6.0
914
- stable
1015
- beta
1116
- nightly
@@ -15,23 +20,34 @@ script:
1520

1621
env:
1722
- ARCH=x86_64
23+
- ARCH=i686
1824

1925
os:
2026
- linux
21-
- osx
27+
28+
addons:
29+
apt:
30+
packages:
31+
- gcc-multilib
2232

2333
# Failures on nightly shouldn't fail the overall build.
2434
matrix:
2535
fast_finish: true
2636
include:
27-
- os: linux
28-
env: ARCH=i686
37+
# 32-bit and 64-bit OSX builds on oldest/stable
38+
- os: osx
39+
env: ARCH=x86_64
2940
rust: stable
30-
sudo: true
3141
- os: osx
3242
env: ARCH=i686
3343
rust: stable
34-
sudo: true
44+
- os: osx
45+
env: ARCH=x86_64
46+
rust: 1.1.0
47+
- os: osx
48+
env: ARCH=i686
49+
rust: 1.1.0
50+
# Docker builds for other targets
3551
- os: linux
3652
env: TARGET=aarch64-unknown-linux-gnu DOCKER_IMAGE=posborne/rust-cross:arm
3753
rust: 1.7.0

ci/run-travis.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,6 @@ if [ "$TARGET" = "" ]; then
3030
TARGET=$HOST
3131
fi
3232

33-
if [ "$TARGET" = "i686-unknown-linux-gnu" ]; then
34-
sudo apt-get -y update
35-
sudo apt-get install -y gcc-multilib
36-
fi
37-
3833
if [ "$DOCKER_IMAGE" = "" ]; then
3934
export RUST_TEST_THREADS=1
4035
curl -sSL "https://raw.githubusercontent.com/carllerche/travis-rust-matrix/master/test" | bash

0 commit comments

Comments
 (0)