Эх сурвалжийг харах

Merge pull request #2045 from MerryMage/travis

travis: Update to XCode 7.3.1
bunnei 10 жил өмнө
parent
commit
fed59e0714
3 өөрчлөгдсөн 4 нэмэгдсэн , 3 устгасан
  1. 2 1
      .travis-build.sh
  2. 1 2
      .travis-deps.sh
  3. 1 0
      .travis.yml

+ 2 - 1
.travis-build.sh

@@ -23,11 +23,12 @@ if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then
 elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
     set -o pipefail
 
+    export MACOSX_DEPLOYMENT_TARGET=10.9
     export Qt5_DIR=$(brew --prefix)/opt/qt5
 
     mkdir build && cd build
     cmake .. -GXcode
-    xcodebuild -configuration Release | xcpretty -c
+    xcodebuild -configuration Release
 
     ctest -VV -C Release
 fi

+ 1 - 2
.travis-deps.sh

@@ -20,7 +20,6 @@ if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then
     )
 elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
     brew update > /dev/null # silence the very verbose output
-    brew unlink cmake
+    brew unlink cmake || true
     brew install cmake qt5 sdl2 dylibbundler
-    gem install xcpretty
 fi

+ 1 - 0
.travis.yml

@@ -7,6 +7,7 @@ matrix:
       dist: trusty
     - os: osx
       sudo: false
+      osx_image: xcode7.3
 
 env:
   global: