From 7520bde6d32af92e8feff4f4a5c976044facad10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Fri, 8 Jan 2016 12:22:57 +0100 Subject: [PATCH] Add support for OS X 10.10 in Travis CI builds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This downloads OS X 10.10 SDK, installs it and uses for compilation. According to https://www.gosquared.com/global/mac/el-capitan/, current market share among OS X versions is: * 10.11 — 41.53% * 10.10 — 38.65% * 10.9 — 14.72% * 10.8 — 5.60% * 10.7 — 5.62% I tried adding 10.9 SDK, but it fails to compile. With this change, we should cover around 80% of OS X users. --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e19c2aff6d..6d19f7d53e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,8 @@ language: c before_install: - if [[ $TRAVIS_OS_NAME == "linux" ]]; then bash scripts/linux/install.sh; fi - if [[ $TRAVIS_OS_NAME == "osx" ]]; then gem install xcpretty-travis-formatter; fi + - if [[ $TRAVIS_OS_NAME == "osx" ]]; then curl -L https://openrct2.website/files/MacOSX10.10.sdk.tar.xz -o MacOSX10.10.sdk.tar.xz; fi + - if [[ $TRAVIS_OS_NAME == "osx" ]]; then sudo tar xf MacOSX10.10.sdk.tar.xz -C /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/; fi sudo: required dist: trusty @@ -24,7 +26,6 @@ matrix: services: - docker - os: osx - sudo: false osx_image: xcode7.2 after_success: - cd build/Release @@ -56,7 +57,7 @@ matrix: script: - if [[ $TRAVIS_OS_NAME == "linux" ]]; then bash scripts/linux/build.sh ; fi - - if [[ $TRAVIS_OS_NAME == "osx" ]]; then set -o pipefail && xcodebuild | xcpretty -f `xcpretty-travis-formatter`; fi + - if [[ $TRAVIS_OS_NAME == "osx" ]]; then set -o pipefail && xcodebuild -sdk macosx10.10 | xcpretty -f `xcpretty-travis-formatter`; fi notifications: on_failure: change