GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-10-04 18:46:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

More tweaks for Travis caching

Browse Source
This commit is contained in:
Alessandro Ranellucci 2018-11-08 13:51:46 +01:00
parent fd5cd7a3e3
commit cbb618a381
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.travis.yml
View File

@ -18,10 +18,10 @@ before_install:
- export SLIC3R_GIT_VERSION=$(git rev-parse HEAD) - export SLIC3R_GIT_VERSION=$(git rev-parse HEAD)
script: script:
- if [[ "${TRAVIS_OS_NAME}" == "linux" && "$BUILD_PL" == true ]]; then ./package/linux/travis-build-main.sh; fi - if [[ "${TRAVIS_OS_NAME}" == "linux" && "$TARGET" == "main" ]]; then ./package/linux/travis-build-main.sh; fi
- if [[ "${TRAVIS_OS_NAME}" == "linux" && "$BUILD_PL" == false ]]; then ./package/linux/travis-build-cpp.sh; fi - if [[ "${TRAVIS_OS_NAME}" == "linux" && "$TARGET" == "cpp" ]]; then ./package/linux/travis-build-cpp.sh; fi
- if [[ "${TRAVIS_OS_NAME}" == "osx" && "$BUILD_PL" == true ]]; then travis_wait 60 ./package/osx/travis-build-main.sh; fi - if [[ "${TRAVIS_OS_NAME}" == "osx" && "$TARGET" == "main" ]]; then travis_wait 60 ./package/osx/travis-build-main.sh; fi
- if [[ "${TRAVIS_OS_NAME}" == "osx" && "$BUILD_PL" == false ]]; then ./package/osx/travis-build-cpp.sh; fi - if [[ "${TRAVIS_OS_NAME}" == "osx" && "$TARGET" == "cpp" ]]; then ./package/osx/travis-build-cpp.sh; fi
branches: branches:
only: only:
@ -51,7 +51,7 @@ matrix:
include: include:
- os: linux - os: linux
env: env:
- BUILD_PL=true - TARGET=main
cache: cache:
directories: directories:
- $HOME/boost_1_63_0 - $HOME/boost_1_63_0
@ -63,7 +63,7 @@ matrix:
- os: linux - os: linux
env: env:
- BUILD_PL=false - TARGET=cpp
- CACHE=$HOME/cache - CACHE=$HOME/cache
cache: cache:
apt: true apt: true
@ -75,7 +75,7 @@ matrix:
- os: osx - os: osx
osx_image: xcode9.4 osx_image: xcode9.4
env: env:
- BUILD_PL=true - TARGET=main
cache: cache:
directories: directories:
- /usr/local/Homebrew - /usr/local/Homebrew
@ -87,7 +87,7 @@ matrix:
- os: osx - os: osx
osx_image: xcode9.4 osx_image: xcode9.4
env: env:
- BUILD_PL=false - TARGET=cpp
- CACHE=$HOME/cache - CACHE=$HOME/cache
cache: cache:
ccache: true ccache: true

9
package/linux/travis-build-main.sh
View File

@ -9,13 +9,16 @@ if [ ! -d $HOME/perl5/perlbrew/perls/slic3r-perl ]; then
tar -C$HOME/perl5/perlbrew/perls -xjf /tmp/slic3r-perlbrew-5.24.tar.bz2 tar -C$HOME/perl5/perlbrew/perls -xjf /tmp/slic3r-perlbrew-5.24.tar.bz2
fi fi
source $HOME/perl5/perlbrew/etc/bashrc
perlbrew switch slic3r-perl
if [ ! -e $HOME/boost_1_63_0/boost/version.hpp ]; then if [ ! -e $HOME/boost_1_63_0/boost/version.hpp ]; then
echo "Downloading boost_1_63_0.built.gcc-4.9.4-buildserver.tar.bz2" echo "Downloading boost_1_63_0.built.gcc-4.9.4-buildserver.tar.bz2"
curl -L "http://www.siusgs.com/slic3r/buildserver/boost_1_63_0.built.gcc-4.9.4-buildserver.tar.bz2" -o /tmp/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 /tmp/boost-compiled.tar.bz2
tar -C$HOME -xjf /tmp/boost-compiled.tar.bz2 tar -C$HOME -xjf /tmp/boost-compiled.tar.bz2
fi fi
if !(perl -MWx -e1 2> /dev/null); then if [ ! -e ./local-lib/lib/perl5/x86_64-linux-thread-multi/Wx.pm ]; then
echo "Downloading slic3r-dependencies.gcc49.travis-wx302.tar.bz2" echo "Downloading slic3r-dependencies.gcc49.travis-wx302.tar.bz2"
curl -L "http://www.siusgs.com/slic3r/buildserver/slic3r-dependencies.travis-wx302.tar.bz2" -o /tmp/local-lib-wx302.tar.bz2 curl -L "http://www.siusgs.com/slic3r/buildserver/slic3r-dependencies.travis-wx302.tar.bz2" -o /tmp/local-lib-wx302.tar.bz2
tar -C$TRAVIS_BUILD_DIR -xjf /tmp/local-lib-wx302.tar.bz2 tar -C$TRAVIS_BUILD_DIR -xjf /tmp/local-lib-wx302.tar.bz2
@ -25,7 +28,5 @@ if !(perl -MWx -e1 2> /dev/null); then
tar -C$HOME -xjf /tmp/wx302.tar.bz2 tar -C$HOME -xjf /tmp/wx302.tar.bz2
fi fi
source $HOME/perl5/perlbrew/etc/bashrc
perlbrew switch slic3r-perl
SLIC3R_STATIC=1 CC=g++-4.9 CXX=g++-4.9 BOOST_DIR=$HOME/boost_1_63_0 perl ./Build.PL SLIC3R_STATIC=1 CC=g++-4.9 CXX=g++-4.9 BOOST_DIR=$HOME/boost_1_63_0 perl ./Build.PL
perl ./Build.PL --gui

2
package/osx/travis-build-main.sh
View File

@ -9,7 +9,7 @@ export BOOST_DIR=/usr/local
perl ./Build.PL perl ./Build.PL
# Only recompile Wx if it's not already there # Only recompile Wx if it's not already there
if !(perl -MWx -e1); then if [ ! -e ./local-lib/lib/perl5/darwin-thread-multi-2level/Wx.pm ]; then
# our patch-wxwidgets.diff assumes Alien::wxWidgets installs wxWidgets 3.0.2 # our patch-wxwidgets.diff assumes Alien::wxWidgets installs wxWidgets 3.0.2
PERL_USE_UNSAFE_INC=1 \ PERL_USE_UNSAFE_INC=1 \
CXX="clang++ -mmacosx-version-min=10.12" \ CXX="clang++ -mmacosx-version-min=10.12" \