diff options
| author |  Thomas Van Lenten <thomasvl@google.com> | 2017-08-07 11:34:48 -0400 |
|---|---|---|
| committer | Thomas Van Lenten <thomasvl@google.com> | 2017-08-07 12:55:46 -0400 |
| commit | ba81c59cf50056ca17faf837e139372e2048be83 (patch) | |
| tree | 6b01da7d7c5eb05c55390308d750d1d077a70987 /objectivec/DevTools | |
| parent | 9b505a92bf6b3163ff9fb234a28dfef9c0330197 (diff) | |
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.)
Diffstat (limited to 'objectivec/DevTools')
| -rwxr-xr-x | objectivec/DevTools/full_mac_build.sh | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/objectivec/DevTools/full_mac_build.sh b/objectivec/DevTools/full_mac_build.sh index c3cc8e68..9ac24bb3 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 ) ;; * ) |