Skip to content

P
protobuf
Commit 80e984e0 authored by Thomas Van Lenten's avatar Thomas Van Lenten Committed by GitHub
Browse files
Options

Merge pull request #3467 from thomasvl/bump_xcode_version 

Xcode 8.3.x cleanups and use on travis
parents fae38169 fe68821e
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
.travis.yml
View file @ 80e984e0
...@@ -8,7 +8,7 @@ language: cpp ...@@ -8,7 +8,7 @@ language: cpp
os: os:
- osx - osx
# The Objective C build needs Xcode 7.0 or later. # The Objective C build needs Xcode 7.0 or later.
osx_image: xcode8.1 osx_image: xcode8.3
script: script:
- ./tests.sh $CONFIG - ./tests.sh $CONFIG
env: env:
......
objectivec/DevTools/full_mac_build.sh
View file @ 80e984e0
...@@ -276,9 +276,7 @@ if [[ "${DO_XCODE_IOS_TESTS}" == "yes" ]] ; then ...@@ -276,9 +276,7 @@ if [[ "${DO_XCODE_IOS_TESTS}" == "yes" ]] ; then
8.3* ) 8.3* )
XCODEBUILD_TEST_BASE_IOS+=( XCODEBUILD_TEST_BASE_IOS+=(
-destination "platform=iOS Simulator,name=iPhone 4s,OS=8.1" # 32bit -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=iPhone 7,OS=latest" # 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
) )
;; ;;
* ) * )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment