Upgrade kokoro to Xcode 14 (#10732)

* Upgrade kokoro to Xcode 14

* Fix osx errors
pull/10771/head
deannagarcia 2 years ago committed by GitHub
parent 887d7954d0
commit 0ee5525a75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      kokoro/macos/prepare_build_macos_rc
  2. 4
      objectivec/DevTools/full_mac_build.sh

@ -15,7 +15,7 @@ brew uninstall protobuf
##
# Select Xcode version
export DEVELOPER_DIR=/Applications/Xcode_13.3.1.app/Contents/Developer
export DEVELOPER_DIR=/Applications/Xcode_14.app/Contents/Developer
sudo xcode-select -s "${DEVELOPER_DIR}"
##

@ -295,7 +295,7 @@ if [[ "${DO_XCODE_IOS_TESTS}" == "yes" ]] ; then
-disable-concurrent-destination-testing
)
;;
11.* | 12.* | 13.*)
11.* | 12.* | 13.* | 14.*)
# Dropped 32bit as Apple doesn't seem support the simulators either.
XCODEBUILD_TEST_BASE_IOS+=(
-destination "platform=iOS Simulator,name=iPhone 8,OS=latest" # 64bit
@ -363,7 +363,7 @@ if [[ "${DO_XCODE_TVOS_TESTS}" == "yes" ]] ; then
-destination "platform=tvOS Simulator,name=Apple TV 4K,OS=latest"
)
;;
13.*)
13.* | 14.*)
XCODEBUILD_TEST_BASE_TVOS+=(
-destination "platform=tvOS Simulator,name=Apple TV 4K (2nd generation),OS=latest"
)

Loading…
Cancel
Save