diff options
author | Thomas Van Lenten <thomasvl@google.com> | 2016-02-16 11:14:47 -0500 |
---|---|---|
committer | Thomas Van Lenten <thomasvl@google.com> | 2016-02-16 11:14:47 -0500 |
commit | 7d1cc109cfbe259eb1267e651142d9fa31601e3f (patch) | |
tree | 9db54f1e411c98582e1908afb82e0aa59208dc3f | |
parent | e35e24800fb8d694bdeea5fd63dc7d1b14d68723 (diff) | |
parent | 1324119a42b9c8cedd328b6adfa5ef00243651f6 (diff) | |
download | protobuf-7d1cc109cfbe259eb1267e651142d9fa31601e3f.tar.gz protobuf-7d1cc109cfbe259eb1267e651142d9fa31601e3f.tar.bz2 protobuf-7d1cc109cfbe259eb1267e651142d9fa31601e3f.zip |
Merge pull request #1244 from thomasvl/bump_xcode_version
Bump up travis to Xcode 7.2
-rw-r--r-- | .travis.yml | 7 | ||||
-rwxr-xr-x | objectivec/DevTools/full_mac_build.sh | 10 | ||||
-rwxr-xr-x | travis.sh | 4 |
3 files changed, 16 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index e368826f..c0309fab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,8 +7,8 @@ language: cpp os: - linux - osx -# The Objective C build needs Xcode 6.4 or later. -osx_image: xcode7.1 +# The Objective C build needs Xcode 7.0 or later. +osx_image: xcode7.2 script: - ./travis.sh $CONFIG env: @@ -67,5 +67,8 @@ matrix: env: CONFIG=ruby22 - os: osx env: CONFIG=jruby + # Currently showing flake randomly, doesn't trace back to a single commit. + - os: osx + env: CONFIG=objectivec_ios notifications: email: false diff --git a/objectivec/DevTools/full_mac_build.sh b/objectivec/DevTools/full_mac_build.sh index 709aae0a..c8681e26 100755 --- a/objectivec/DevTools/full_mac_build.sh +++ b/objectivec/DevTools/full_mac_build.sh @@ -234,7 +234,7 @@ if [[ "${DO_XCODE_IOS_TESTS}" == "yes" ]] ; then echo "ERROR: Xcode 6.3/6.4 no longer supported for building, please use 7.0 or higher." 1>&2 exit 10 ;; - 7.* ) + 7.1* ) XCODEBUILD_TEST_BASE_IOS+=( -destination "platform=iOS Simulator,name=iPhone 4s,OS=8.1" # 32bit -destination "platform=iOS Simulator,name=iPhone 6,OS=9.0" # 64bit @@ -242,6 +242,14 @@ if [[ "${DO_XCODE_IOS_TESTS}" == "yes" ]] ; then -destination "platform=iOS Simulator,name=iPad Air,OS=9.0" # 64bit ) ;; + 7.* ) + XCODEBUILD_TEST_BASE_IOS+=( + -destination "platform=iOS Simulator,name=iPhone 4s,OS=8.1" # 32bit + -destination "platform=iOS Simulator,name=iPhone 6,OS=9.2" # 64bit + -destination "platform=iOS Simulator,name=iPad 2,OS=8.1" # 32bit + -destination "platform=iOS Simulator,name=iPad Air,OS=9.2" # 64bit + ) + ;; * ) echo "Time to update the simulator targets for Xcode ${XCODE_VERSION}" exit 2 @@ -195,9 +195,9 @@ build_objectivec_ios() { build-tests IOS_DESTINATIONS=( "platform=iOS Simulator,name=iPhone 4s,OS=8.1" # 32bit - "platform=iOS Simulator,name=iPhone 6,OS=9.1" # 64bit + "platform=iOS Simulator,name=iPhone 6,OS=9.2" # 64bit "platform=iOS Simulator,name=iPad 2,OS=8.1" # 32bit - "platform=iOS Simulator,name=iPad Air,OS=9.1" # 64bit + "platform=iOS Simulator,name=iPad Air,OS=9.2" # 64bit ) for i in "${IOS_DESTINATIONS[@]}" ; do internal_xctool_debug_and_release \ |