diff --git a/.travis.yml b/.travis.yml index 9641aede6..068843f22 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,6 @@ language: generic before_install: - sh package/linux/travis-decrypt-key -env: - - BOOST_DIR=$HOME/boost_1_63_0 - - SLIC3R_STATIC=1 script: - bash package/linux/travis-setup.sh - cmake -DBOOST_ROOT=$BOOST_DIR src/ @@ -53,9 +50,13 @@ matrix: - WXVERSION=pkg - CC=gcc-7 - CXX=g++-7 + - BOOST_DIR=$HOME/boost_1_63_0 + - SLIC3R_STATIC=1 - os: osx env: - WXVERSION=pkg + - BOOST_DIR=$HOME/boost_1_63_0 + - SLIC3R_STATIC=1 env: global: - secure: eEVRZNMv7FM6jrOU9iAFkDhWxFQ1WtHBEaObImcvtFUxy6vWSt3ehFFeTRouj3uHQAnbvUzziDyvPPm8/95alv5g/du8ML6YzzqKBKfazM0xQ7SF6R2DQL8lfFIp+RSV7T02byEP1f1g7Zva7xH9szIlDcSfU0pXW4KWbkBFMd8= diff --git a/package/linux/travis-setup.sh b/package/linux/travis-setup.sh index 79780609e..b8f4b28a9 100755 --- a/package/linux/travis-setup.sh +++ b/package/linux/travis-setup.sh @@ -11,12 +11,13 @@ if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then fi tar -C$HOME -xjf $CACHE/wx${WXVERSION}.tar.bz2 fi - if [ ! -e $CACHE/boost-compiled.tar.bz2 ]; then - echo "Downloading http://www.siusgs.com/slic3r/buildserver/boost_1_63_0.built.gcc-4.9.4-buildserver.tar.bz2 => $CACHE/boost-compiled.tar.bz2" - curl -L "http://www.siusgs.com/slic3r/buildserver/boost_1_63_0.built.gcc-4.9.4-buildserver.tar.bz2" -o $CACHE/boost-compiled.tar.bz2 - fi + + if [ ! -e $CACHE/boost-compiled.tar.bz2 ]; then + echo "Downloading http://www.siusgs.com/slic3r/buildserver/boost_1_63_0.built.gcc-4.9.4-buildserver.tar.bz2 => $CACHE/boost-compiled.tar.bz2" + curl -L "http://www.siusgs.com/slic3r/buildserver/boost_1_63_0.built.gcc-4.9.4-buildserver.tar.bz2" -o $CACHE/boost-compiled.tar.bz2 + fi - tar -C$HOME -xjf $CACHE/boost-compiled.tar.bz2 + tar -C$HOME -xjf $CACHE/boost-compiled.tar.bz2 elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then if [[ "$WXVERSION" != "pkg" ]]; then