mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-09-02 12:32:34 +02:00
Code Issues Projects Releases Wiki Activity

.travis.yml: specify osx images (#95)

Browse Source 
* .travis.yml:specify osx images

* remove allow_failures

* don't specify core num
This commit is contained in:
Andy Alt
2018-03-13 02:09:09 -05:00
committed by GitHub
parent fdfbc6ad57
commit 51bf09ad9f
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
.travis.yml
View File

@@ -41,16 +41,11 @@ matrix:
env: Tr_Compiler_Version="default" env: Tr_Compiler_Version="default"
dist: trusty # broken compiler on 12.04 dist: trusty # broken compiler on 12.04
- os: osx - os: osx
#osx_image: xcode6.4 # seems broken and has lower priority in queue than default one osx_image: xcode9.2
env: Tr_Xcode_Version="default" env: Tr_Xcode_Version="9.2"
#env: Tr_Xcode_Version="6.4"
# https://docs.travis-ci.com/user/osx-ci-environment/#OS-X-Version
# https://github.com/Homebrew/brew/blob/master/docs/Installation.md#requirements
fast_finish: true
allow_failures:
- os: osx - os: osx
# it's not really acceptable to wait 40 minutes or sometimes up to even 3 hours osx_image: xcode9.3beta
# for the result just because the queue for mac is always so long env: Tr_Xcode_Version="9.3beta"
git: git:
submodules: false submodules: false
@@ -76,10 +71,10 @@ 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-zg.sh -c 4; fi - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$(echo "$CC" | grep 'clang')" = "" ]; then mk/linux/build-zg.sh; fi
- if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$(echo "$CC" | grep 'clang')" != "" ]; then mk/linux/build-zg.sh -w -c 4; fi - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$(echo "$CC" | grep 'clang')" != "" ]; then mk/linux/build-zg.sh -w; 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-zg.sh -c 4; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then mk/macos/build-zg.sh; fi
# https://docs.travis-ci.com/user/notifications/#IRC-notification # https://docs.travis-ci.com/user/notifications/#IRC-notification
notifications: notifications:
@@ -89,5 +84,7 @@ notifications:
skip_join: true skip_join: true
use_notice: true use_notice: true
on_success: change on_success: change
on_error: always
on_failure: change
template: template:
- "[%{repository_name}#%{branch}@%{commit}] %{author}: %{message} %{build_url}" - "[%{repository_name}#%{branch}@%{commit}] %{author}: %{message} %{build_url}"