From c8508c092fd4428a1caa6d8a46a656e940a3ebd1 Mon Sep 17 00:00:00 2001 From: Cody Tubbs Date: Fri, 28 Apr 2017 11:48:41 -0700 Subject: Updated .travis.yml for linux32 optimized compile Added before_install to handle packages that solve the current 32-bit Linux optimized release issues. This addition also ensures future changes in dependencies won't cause similar errors. Defining OS for the i686 target is no longer needed and will break the build if defined. --- .travis.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index e61415c..412c553 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,13 @@ cache: - $HOME/.cargo - $TRAVIS_BUILD_DIR/target - $HOME/docker/ - + +before_install: + - if [[ "$NAME" == "linux32" ]]; then + sudo dpkg --purge build-essential libtool; + sudo apt-get -qq update; + sudo apt-get -yq --force-yes install libstdc++6:i386 libbz2-dev:i386 gcc-multilib:i386 musl-tools:i386; fi + matrix: include: - os: linux @@ -35,15 +41,8 @@ matrix: - TARGET=i686-unknown-linux-musl - NAME=linux32 - EXT=tar.gz - - CC=gcc dist: trusty sudo: required - addons: - apt: - packages: &i686 - - musl-tools - - gcc-multilib - - libbz2-dev - os: linux env: - TARGET=x86_64-pc-windows-gnu -- cgit v1.2.3