From e62abbe2fef9fa00eeb509a8c3e3c4d24278e36f Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Sun, 7 Jan 2018 09:43:00 -0800 Subject: [PATCH 1/2] iOS using wrong Xcode --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0c585df..436c0e5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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' From 5e985fbfc8188b422ab137b6199a7f0728f9a07d Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Sun, 7 Jan 2018 13:23:54 -0800 Subject: [PATCH 2/2] Break up iOS get/tar commands to fix timeout --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 436c0e5..be20c44 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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++` &&