GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-07-30 22:52:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move travis_wait to .travis.yml

Browse Source
This commit is contained in:
Alessandro Ranellucci 2018-11-07 18:26:27 +01:00
parent dd7127a36a
commit bc4af97d3d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -20,7 +20,7 @@ before_install:
script:
- if [[ "${TRAVIS_OS_NAME}" == "linux" && "$BUILD_PL" == true ]]; 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}" == "osx" && "$BUILD_PL" == true ]]; then ./package/osx/travis-build-main.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" && "$BUILD_PL" == false ]]; then ./package/osx/travis-build-cpp.sh; fi
branches:

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

@ -15,7 +15,7 @@ if !(perl -MWx -e1 2> /dev/null); then
CXX="clang++ -mmacosx-version-min=10.12" \
CPPFLAGS="-mmacosx-version-min=10.12 -D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=1" \
LDFLAGS="-mmacosx-version-min=10.12" \
travis_wait 60 cpanm --local-lib local-lib Alien::wxWidgets --reinstall \
cpanm --local-lib local-lib Alien::wxWidgets --reinstall \
--configure-args="--wxWidgets-build=1 --wxWidgets-extraflags=\"--with-macosx-version-min=10.12 --disable-qtkit --disable-mediactrl --disable-webkit --disable-webview\" --wxWidgets-userpatch=$(pwd)/package/osx/patch-wxwidgets.diff"
PERL_USE_UNSAFE_INC=1 cpanm --local-lib local-lib --reinstall -v https://github.com/alranel/wxPerl-osx10.12/tarball/master