From ba81c59cf50056ca17faf837e139372e2048be83 Mon Sep 17 00:00:00 2001 From: Thomas Van Lenten Date: Mon, 7 Aug 2017 11:34:48 -0400 Subject: [PATCH 1/2] Fix up Xcode 8.3.x support. - Xcode 8.3.3 bumped the simulators to 10.3.1, so 10.3 fails. Just use the "latest" naming instead to avoid issues. - Also switch to just testing an old 32bit build and new 64bit build as there isn't any code in protobuf that should care about form facts. (Looks like the iPad Pro simulator names aren't always constantly, on some developer machines they are "iPad Pro (9.7 inch)" while on others they are "iPad Pro (9.7-inch)"; so just avoid using them.) --- objectivec/DevTools/full_mac_build.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/objectivec/DevTools/full_mac_build.sh b/objectivec/DevTools/full_mac_build.sh index c3cc8e6826..9ac24bb38a 100755 --- a/objectivec/DevTools/full_mac_build.sh +++ b/objectivec/DevTools/full_mac_build.sh @@ -276,9 +276,7 @@ if [[ "${DO_XCODE_IOS_TESTS}" == "yes" ]] ; then 8.3* ) XCODEBUILD_TEST_BASE_IOS+=( -destination "platform=iOS Simulator,name=iPhone 4s,OS=8.1" # 32bit - -destination "platform=iOS Simulator,name=iPhone 7,OS=10.3" # 64bit - -destination "platform=iOS Simulator,name=iPad 2,OS=8.1" # 32bit - -destination "platform=iOS Simulator,name=iPad Pro (9.7 inch),OS=10.3" # 64bit + -destination "platform=iOS Simulator,name=iPhone 7,OS=latest" # 64bit ) ;; * ) From fe68821e027fd04e346b304d8940c6c35847b256 Mon Sep 17 00:00:00 2001 From: Thomas Van Lenten Date: Mon, 7 Aug 2017 11:35:41 -0400 Subject: [PATCH 2/2] Move travis to the Xcode 8.3 (8.3.3) image. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d49e0a7131..e7853ebed8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ language: cpp os: - osx # The Objective C build needs Xcode 7.0 or later. -osx_image: xcode8.1 +osx_image: xcode8.3 script: - ./tests.sh $CONFIG env: