Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

travis' configuration test 3

This commit is contained in:
filux 2017-01-21 10:44:47 +01:00
parent bfe2bc0d57
commit b2aa5e1991
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.travis.yml
View File

@ -31,7 +31,9 @@ matrix:
# https://github.com/Homebrew/brew/blob/master/docs/Installation.md#requirements # https://github.com/Homebrew/brew/blob/master/docs/Installation.md#requirements
fast_finish: true fast_finish: true
allow_failures: allow_failures:
#- os: osx - os: osx
# it's not really acceptable to wait 40 minutes or sometimes up to even 3 hours
# for the result just because the queue for mac is always so long
git: git:
submodules: false submodules: false
@ -57,7 +59,8 @@ before_install:
script: script:
# ALL THE BUILD COMMANDS HERE # ALL THE BUILD COMMANDS HERE
- if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$(echo "$CC" | grep 'clang')" = "" ]; then mk/linux/build-mg.sh -c 4; else mk/linux/build-mg.sh -w -c 4; fi - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$(echo "$CC" | grep 'clang')" = "" ]; then mk/linux/build-mg.sh -c 4; fi
- if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$(echo "$CC" | grep 'clang')" != "" ]; then mk/linux/build-mg.sh -w -c 4; fi
# ^ -w may be removed on more modern dist: than trusty, problems related with 'new wx+clang+old gcc' # ^ -w may be removed on more modern dist: than trusty, problems related with 'new wx+clang+old gcc'
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then mk/macos/build-mg.sh -c 4; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then mk/macos/build-mg.sh -c 4; fi

2
mk/linux/make-binary-archive.sh
View File

@ -9,7 +9,7 @@ CURRENTDIR="$(dirname "$(readlink -f "$0")")"
# set this to non 0 to skip building the binary # set this to non 0 to skip building the binary
skipbinarybuild=0 skipbinarybuild=0
if [ "$1" = "-CI" ] || ( [ "$1" = "--installer" ] && \ if [ "$1" = "-CI" ] || ( [ "$1" = "--installer" ] && \
[ "$(find "$CURRENTDIR" -name 'megaglest' -mmin -60)" ] ); then [ "$(find "$CURRENTDIR" -maxdepth 1 -name 'megaglest' -mmin -60)" ] ); then
skipbinarybuild=1 skipbinarybuild=1
fi fi