diff --git a/kokoro/macos/prepare_build_macos_rc b/kokoro/macos/prepare_build_macos_rc index 13b00706756f..9b9b2df7b88c 100755 --- a/kokoro/macos/prepare_build_macos_rc +++ b/kokoro/macos/prepare_build_macos_rc @@ -6,6 +6,10 @@ set -eux export HOMEBREW_PREFIX=$(brew --prefix) +## +# Remove any pre-existing protobuf installation. +brew uninstall protobuf + ## # Select Xcode version diff --git a/kokoro/release/python/macos/build_artifacts.sh b/kokoro/release/python/macos/build_artifacts.sh index 75644539fa05..4ab9bb8744bc 100755 --- a/kokoro/release/python/macos/build_artifacts.sh +++ b/kokoro/release/python/macos/build_artifacts.sh @@ -2,6 +2,9 @@ set -ex +# Remove any pre-existing protobuf installation. +brew uninstall protobuf + # change to repo root pushd $(dirname $0)/../../../.. diff --git a/objectivec/DevTools/full_mac_build.sh b/objectivec/DevTools/full_mac_build.sh index 9ed5b15b2357..4bf336958696 100755 --- a/objectivec/DevTools/full_mac_build.sh +++ b/objectivec/DevTools/full_mac_build.sh @@ -290,7 +290,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 @@ -358,7 +358,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" ) diff --git a/objectivec/Tests/CocoaPods/run_tests.sh b/objectivec/Tests/CocoaPods/run_tests.sh index 4f65042bca7d..dfc0aa47d3c9 100755 --- a/objectivec/Tests/CocoaPods/run_tests.sh +++ b/objectivec/Tests/CocoaPods/run_tests.sh @@ -128,7 +128,7 @@ do_test() { # errors. xcodebuild_args+=( -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO - -destination "platform=iOS Simulator,name=iPad Air (5th generation),OS=15.4" + -destination "platform=iOS Simulator,name=iPad Air (5th generation),OS=16.0" ) fi