set an eval to force correct

This commit is contained in:
Joseph Lenox 2018-05-13 22:43:41 -05:00 committed by Joseph Lenox
parent a8b51536bd
commit 9fd01e6807

View File

@ -1,15 +1,19 @@
before_install:
- sh package/linux/travis-decrypt-key
- bash package/linux/travis-setup.sh
install:
- export BOOST_DIR=$HOME/boost_1_63_0
- export SLIC3R_STATIC=1
- sh package/linux/travis-decrypt-key
- bash package/linux/travis-setup.sh
- eval "${MATRIX_EVAL}"
env:
- BOOST_DIR=$HOME/boost_1_63_0
- SLIC3R_STATIC=1
script:
- cmake -DBOOST_ROOT=$BOOST_DIR src/
- make
after_success:
- LD_LIBRARY_PATH=$WXDIR/lib package/linux/make_archive.sh linux-x64
- package/linux/appimage.sh x86_64
- package/deploy/sftp.sh linux ~/slic3r-upload.rsa *.bz2 Slic3r*.AppImage
- package/deploy/sftp-symlink.sh linux ~/slic3r-upload.rsa AppImage Slic3r*.AppImage
- package/deploy/sftp-symlink.sh linux ~/slic3r-upload.rsa tar.bz2 *.bz2
- LD_LIBRARY_PATH=$WXDIR/lib package/linux/make_archive.sh linux-x64
- package/linux/appimage.sh x86_64
- package/deploy/sftp.sh linux ~/slic3r-upload.rsa *.bz2 Slic3r*.AppImage
- package/deploy/sftp-symlink.sh linux ~/slic3r-upload.rsa AppImage Slic3r*.AppImage
- package/deploy/sftp-symlink.sh linux ~/slic3r-upload.rsa tar.bz2 *.bz2
branches:
only:
- master
@ -48,15 +52,11 @@ matrix:
language: c++
env:
- WXVERSION=pkg
script:
- CXX=g++-7 CC=gcc-7 cmake -DBOOST_ROOT=$BOOST_DIR src/
- make
- MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
- os: osx
language: c++
env: WXVERSION=pkg
script:
- cmake -DBOOST_ROOT=$BOOST_DIR src/
- make
env:
- WXVERSION=pkg
env:
global:
- secure: eEVRZNMv7FM6jrOU9iAFkDhWxFQ1WtHBEaObImcvtFUxy6vWSt3ehFFeTRouj3uHQAnbvUzziDyvPPm8/95alv5g/du8ML6YzzqKBKfazM0xQ7SF6R2DQL8lfFIp+RSV7T02byEP1f1g7Zva7xH9szIlDcSfU0pXW4KWbkBFMd8=