diff --git a/.travis.yml b/.travis.yml index 8ea6f5fad..09f79c408 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,6 +29,18 @@ matrix: 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 + - os: osx + #osx_image: xcode6.4 + env: Tr_Xcode_Version="default" + #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 + - os: osx + #osx_image: xcode6.4 + #env: Tr_Xcode_Version="default" + 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 @@ -44,9 +56,11 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then ./.travis-before_install.sh "$CC" "$Tr_Compiler_Version"; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install sdl2 lua freetype ftgl libogg glew libvorbis cppunit glib fribidi miniupnpc wxmac; fi + # ^ not on travis also needed are: cmake + pkgconfig + xquartz (find by "search") + (maybe) git + (maybe) bash + - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew outdated cmake || brew upgrade cmake; brew outdated pkgconfig || brew upgrade pkgconfig; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew link --force gettext; fi - # ^ odd linking problems related with brew which is not creating links, not on travis also needed are: cmake + pkgconfig + xquartz (find by "search") + (maybe) git - - if [ "$TRAVIS_OS_NAME" = "osx" ] && [ "$Tr_Xcode_Version" = "6.4" ]; then brew uninstall --force brew-cask; brew update; brew install Caskroom/cask/xquartz; fi + # ^ odd linking problems related with brew which is not creating links + - if [ "$TRAVIS_OS_NAME" = "osx" ] && [ "$Tr_Xcode_Version" = "6.4" ]; then brew update; brew cleanup; brew cask cleanup; brew uninstall --force brew-cask; brew update; brew install Caskroom/cask/xquartz; fi - if [ "$Tr_Compiler_Version" != "" ] && [ "$Tr_Compiler_Version" != "default" ] && [ "$CC" = "gcc" ]; then export CXX="g++-${Tr_Compiler_Version}" CC="gcc-${Tr_Compiler_Version}"; fi - if [ "$Tr_Compiler_Version" != "" ] && [ "$Tr_Compiler_Version" != "default" ] && [ "$CC" == "clang" ]; then export CXX="clang++-${Tr_Compiler_Version}" CC="clang-${Tr_Compiler_Version}"; fi - $CC --version