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

Jump to bottom

Fix python release on macos #10512

Merged
merged 7 commits into from Sep 7, 2022
Merged

Fix python release on macos #10512

merged 7 commits into from Sep 7, 2022

Commits on Jul 6, 2022

  1. Disabling broken mac php tests

    @mkruskal-google
    mkruskal-google committed Jul 6, 2022
    Copy the full SHA
    c1458b4 View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2022

  1. Merge branch 'protocolbuffers:3.20.x' into 3.20.x

    @mkruskal-google
    mkruskal-google committed Sep 7, 2022
    Copy the full SHA
    bcdef55 View commit details
    Browse the repository at this point in the history

  2. Adding explicit arena.h include

    @mkruskal-google
    mkruskal-google committed Sep 7, 2022
    Copy the full SHA
    e4395e7 View commit details
    Browse the repository at this point in the history

  3. Revert "Adding explicit arena.h include" 

    This reverts commit e4395e7.
    @mkruskal-google
    mkruskal-google committed Sep 7, 2022
    Copy the full SHA
    e622dc1 View commit details
    Browse the repository at this point in the history

  4. Removing extra protobuf directory

    @mkruskal-google
    mkruskal-google committed Sep 7, 2022
    Copy the full SHA
    ae77ebd View commit details
    Browse the repository at this point in the history

  5. Revert "Removing extra protobuf directory" 

    This reverts commit ae77ebd.
    @mkruskal-google
    mkruskal-google committed Sep 7, 2022
    Copy the full SHA
    dbedf70 View commit details
    Browse the repository at this point in the history

  6. Uninstall system protobuf to prevent version conflicts

    @mkruskal-google
    mkruskal-google committed Sep 7, 2022
    Copy the full SHA
    1bac307 View commit details
    Browse the repository at this point in the history