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
protocolbuffers · Sep 7, 2022 · c1a2d2e · c1a2d2e
1 parent a826282
commit c1a2d2e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git 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
@@ -2,6 +2,9 @@
 
 set -ex
 
+# Remove any pre-existing protobuf installation.
+brew uninstall protobuf
+
 # change to repo root
 pushd $(dirname $0)/../../../..