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