Skip to content

Commit 8c029ed

Browse files
author
Jorge Aparicio
committed
use docker
1 parent b0e5d13 commit 8c029ed

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

.travis.yml

+2-5
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,8 @@ matrix:
4444
os: osx
4545
- env: TARGET=i586-unknown-linux-gnu
4646
os: linux
47-
dist: trusty
48-
addons:
49-
apt:
50-
packages:
51-
- gcc-multilib
47+
services: docker
48+
sudo: required
5249
- env: TARGET=i686-unknown-linux-gnu
5350
os: linux
5451
addons:

ci/env.sh

+6-1
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,15 @@ case $TARGET in
3030
export PREFIX=arm-linux-gnueabihf-
3131
export QEMU_LD_PREFIX=/usr/arm-linux-gnueabihf
3232
;;
33+
i586-unknown-linux-gnu)
34+
# NOTE $DOCKER values: 'y' (yes, call docker), 'i' (inside a docker container) or 'n' ("no)
35+
if [[ -z $DOCKER ]]; then
36+
export DOCKER=y
37+
fi
38+
;;
3339
mips-unknown-linux-gnu)
3440
# See #2
3541
export DONT_RUN_TESTS=y
36-
# NOTE $DOCKER values: 'y' (yes, call docker), 'i' (inside a docker container) or 'n' ("no)
3742
if [[ -z $DOCKER ]]; then
3843
export DOCKER=y
3944
fi

ci/install.sh

+4
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ install_c_toolchain() {
3838
sudo apt-get install -y --no-install-recommends \
3939
gcc-aarch64-linux-gnu libc6-dev-arm64-cross
4040
;;
41+
i586-unknown-linux-gnu)
42+
apt-get install -y --no-install-recommends \
43+
gcc libc6-dev-i386
44+
;;
4145
mips-unknown-linux-gnu)
4246
apt-get install -y --no-install-recommends \
4347
gcc-mips-linux-gnu libc6-dev-mips-cross

0 commit comments

Comments
 (0)