Skip to content

Commit

Permalink
Upgrading simulator version (#10755)
Browse files Browse the repository at this point in the history
* Upgrading simulator version

* Allow Xcode 14 for testing

* Fix python release on macos (#10512)

* Disabling broken mac php tests

* Adding explicit arena.h include

* Revert "Adding explicit arena.h include"

This reverts commit e4395e7.

* Removing extra protobuf directory

* Revert "Removing extra protobuf directory"

This reverts commit ae77ebd.

* Uninstall system protobuf to prevent version conflicts
  • Loading branch information
mkruskal-google committed Oct 10, 2022
1 parent 98460d3 commit 5201715
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 3 deletions.
4 changes: 4 additions & 0 deletions kokoro/macos/prepare_build_macos_rc
Expand Up @@ -6,6 +6,10 @@ set -eux

export HOMEBREW_PREFIX=$(brew --prefix)

##
# Remove any pre-existing protobuf installation.
brew uninstall protobuf

##
# Select Xcode version

Expand Down
3 changes: 3 additions & 0 deletions kokoro/release/python/macos/build_artifacts.sh
Expand Up @@ -2,6 +2,9 @@

set -ex

# Remove any pre-existing protobuf installation.
brew uninstall protobuf

# change to repo root
pushd $(dirname $0)/../../../..

Expand Down
4 changes: 2 additions & 2 deletions objectivec/DevTools/full_mac_build.sh
Expand Up @@ -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
Expand Down Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion objectivec/Tests/CocoaPods/run_tests.sh
Expand Up @@ -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

Expand Down

0 comments on commit 5201715

Please sign in to comment.