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.

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

Backport 24.x fixes for absl dep update and setup.py #13534

Merged
merged 2 commits into from
Aug 14, 2023

Conversation

zhangskz
Copy link
Member

Backports fixes for #13499 and #13501 to 24.x branch

This proto is only used in C++ tests, and doesn't need to be built in python.  Python doesn't support editions yet, so we should just remove it for now.  This also fixes some other issues with setup.py where tests fail.

Closes protocolbuffers#13501

PiperOrigin-RevId: 555681295
@zhangskz zhangskz requested a review from a team as a code owner August 14, 2023 15:27
@zhangskz zhangskz requested review from deannagarcia and removed request for a team August 14, 2023 15:27
@zhangskz zhangskz added the 🅰️ safe for tests Mark a commit as safe to run presubmits over label Aug 14, 2023
@github-actions github-actions bot removed the 🅰️ safe for tests Mark a commit as safe to run presubmits over label Aug 14, 2023
…rs#13515)

* Update absl submodule and dep to latest 20230802.0 LTS

* Fix absl submodule

* Update submodule

* Update absl submodule to correct commit
@zhangskz
Copy link
Member Author

Updated to cherry-pick original git commit including submodule dep for absl fix (instead of copybara commit which excludes it)

@zhangskz zhangskz requested review from mkruskal-google and removed request for deannagarcia and a team August 14, 2023 15:37
@zhangskz zhangskz added the 🅰️ safe for tests Mark a commit as safe to run presubmits over label Aug 14, 2023
@github-actions github-actions bot removed the 🅰️ safe for tests Mark a commit as safe to run presubmits over label Aug 14, 2023
@zhangskz zhangskz merged commit 7520eff into protocolbuffers:24.x Aug 14, 2023
125 of 126 checks passed
@zhangskz zhangskz deleted the backport-24-x branch August 14, 2023 16:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants