Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix python release on macos #10512

Merged
merged 7 commits into from
Sep 7, 2022
Merged

Fix python release on macos #10512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c1458b4
Disabling broken mac php tests
mkruskal-google Jun 30, 2022
bcdef55
Merge branch 'protocolbuffers:3.20.x' into 3.20.x
mkruskal-google Sep 7, 2022
e4395e7
Adding explicit arena.h include
mkruskal-google Sep 7, 2022
e622dc1
Revert "Adding explicit arena.h include"
mkruskal-google Sep 7, 2022
ae77ebd
Removing extra protobuf directory
mkruskal-google Sep 7, 2022
dbedf70
Revert "Removing extra protobuf directory"
mkruskal-google Sep 7, 2022
1bac307
Uninstall system protobuf to prevent version conflicts
mkruskal-google Sep 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions kokoro/macos/prepare_build_macos_rc
View file
Open in desktop
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
View file
Open in desktop
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