Skip to content

Commit

Permalink
Fix python release on macos (#10512)
Browse files Browse the repository at this point in the history
* 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 authored Sep 7, 2022
1 parent a826282 commit c1a2d2e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 0 deletions.
4 changes: 4 additions & 0 deletions kokoro/macos/prepare_build_macos_rc
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
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

0 comments on commit c1a2d2e

Please sign in to comment.