diff --git a/.travis.yml b/.travis.yml index 4dcf7cc39..5cf610760 100644 --- a/.travis.yml +++ b/.travis.yml @@ -72,7 +72,17 @@ matrix: - package/linux/travis-deploy-cpp.sh - os: osx - osx_image: xcode9.4 + osx_image: xcode6.4 # OS X 10.10 + env: + - TARGET=main + cache: + directories: + - /usr/local/Homebrew + - $HOME/Library/Caches/Homebrew + - local-lib + + - os: osx + osx_image: xcode9.4 # OS X 10.13 env: - TARGET=main cache: diff --git a/package/osx/make_dmg.sh b/package/osx/make_dmg.sh index 81b0b9012..61e3a5849 100755 --- a/package/osx/make_dmg.sh +++ b/package/osx/make_dmg.sh @@ -13,7 +13,6 @@ set -euo pipefail if !(perl -Mlocal::lib=local-lib -MPAR::Packer -e1 2> /dev/null); then echo "The PAR::Packer module was not found; installing..." cpanm --local-lib local-lib PAR::Packer - exit 1 fi WD=$(dirname $0) diff --git a/package/osx/travis-build-main.sh b/package/osx/travis-build-main.sh index 204e859ca..1dab2c14b 100755 --- a/package/osx/travis-build-main.sh +++ b/package/osx/travis-build-main.sh @@ -7,9 +7,7 @@ brew link --overwrite perl cpanminus export SLIC3R_STATIC=1 export BOOST_DIR=/usr/local -#perl ./Build.PL +perl ./Build.PL export LIBRARY_PATH=/usr/local/lib -cpanm -v --reinstall --local-lib local-lib Alien::wxWidgets -cpanm -v --reinstall --local-lib local-lib Wx perl ./Build.PL --gui