Browse Source

Merge pull request #5992 from DonLakeFlyer/iOSXCode

iOS using wrong Xcode
QGC4.4
Don Gagne 7 years ago committed by GitHub
parent
commit
4259f9c272
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 7
      .travis.yml

7
.travis.yml

@ -30,7 +30,7 @@ matrix: @@ -30,7 +30,7 @@ matrix:
env: SPEC=macx-clang CONFIG=installer
sudo: required
- os: osx
osx_image: xcode8
osx_image: xcode9.2
env: SPEC=macx-ios-clang CONFIG=release
sudo: false
# OSX builds pared back to installer only since travis sucks so bad we can't afford more than one'
@ -132,7 +132,10 @@ install: @@ -132,7 +132,10 @@ install:
# ios dependencies: qt
- if [ "${SPEC}" = "macx-ios-clang" ]; then
wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.9.3-ios-min.tar.bz2 &&
wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.9.3-ios-min.tar.bz2
;
fi
- if [ "${SPEC}" = "macx-ios-clang" ]; then
tar jxf Qt5.9.3-ios-min.tar.bz2 -C /tmp &&
export IOS_CCACHE_CC=`/usr/bin/xcrun -sdk iphoneos -find clang` &&
export IOS_CCACHE_CXX=`/usr/bin/xcrun -sdk iphoneos -find clang++` &&

Loading…
Cancel
Save