AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Bump up travis to Xcode 7.2

Browse Source 
- Update simulator versions used.
- Mark the iOS tests as flaky while trying to dig out the root cause.
This commit is contained in:
Thomas Van Lenten 2016-02-16 09:19:50 -05:00
parent e35e24800f
commit 1324119a42
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.travis.yml
View File

@ -7,8 +7,8 @@ language: cpp
os: os:
- linux - linux
- osx - osx
# The Objective C build needs Xcode 6.4 or later. # The Objective C build needs Xcode 7.0 or later.
osx_image: xcode7.1 osx_image: xcode7.2
script: script:
- ./travis.sh $CONFIG - ./travis.sh $CONFIG
env: env:
@ -67,5 +67,8 @@ matrix:
env: CONFIG=ruby22 env: CONFIG=ruby22
- os: osx - os: osx
env: CONFIG=jruby env: CONFIG=jruby
# Currently showing flake randomly, doesn't trace back to a single commit.
- os: osx
env: CONFIG=objectivec_ios
notifications: notifications:
email: false email: false

10
objectivec/DevTools/full_mac_build.sh
View File

@ -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 echo "ERROR: Xcode 6.3/6.4 no longer supported for building, please use 7.0 or higher." 1>&2
exit 10 exit 10
;; ;;
7.* ) 7.1* )
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 6,OS=9.0" # 64bit -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 -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}" echo "Time to update the simulator targets for Xcode ${XCODE_VERSION}"
exit 2 exit 2

4
travis.sh
View File

@ -195,9 +195,9 @@ build_objectivec_ios() {
build-tests build-tests
IOS_DESTINATIONS=( IOS_DESTINATIONS=(
"platform=iOS Simulator,name=iPhone 4s,OS=8.1" # 32bit "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 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 for i in "${IOS_DESTINATIONS[@]}" ; do
internal_xctool_debug_and_release \ internal_xctool_debug_and_release \