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

[deps] Upgrade protobuf version to v25.0 #34513

Merged
merged 7 commits into from Nov 10, 2023
Merged

[deps] Upgrade protobuf version to v25.0 #34513

merged 7 commits into from Nov 10, 2023

Conversation

acozzette
Copy link
Contributor

@acozzette acozzette commented Sep 27, 2023

This commit upgrades gRPC to protobuf v25.0 and makes some fixes to account for upb changes. One major change is that upb has been merged into the protobuf repo, so we can now drop the separate @upb dependency. Another is that .upb.c files no longer exist and there are new .upb_minitable.h and .upb_minitable.c files. The longer filenames exceeded a Windows restriction, so to work around that I renamed the upb-generated directory to just upb-gen, and likewise for upbdefs-generated.

@acozzette acozzette changed the title Upgrade protobuf version to latest commit on main [deps] Upgrade protobuf version to latest commit on main Sep 27, 2023
@acozzette
Copy link
Contributor Author

@veblush What are the next steps to get the full suite of tests to run against this change?

This includes deleting the obsolete .upb.c files and renaming
upb-generated to upb-gen.
Copy link
Contributor

@veblush veblush left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm thank you for taking care of this upgrade!

@veblush
Copy link
Contributor

veblush commented Nov 10, 2023

Distribution Tests Python Windows failed because this file is too long (sigh)

T:\altsrc\github\grpc\workspace_python_windows_x86_Python38_32bit\python_build\\temp.win-amd64-cpython-312\\Release\\src\core\ext\upb-gen\envoy\extensions\load_balancing_policies\client_side_weighted_round_robin\v3\client_side_weighted_round_robin.upb_minitable.obj

This needs another cut back.

veblush added a commit that referenced this pull request Nov 10, 2023
To mitigate the following windows long path issue found in
#34513. Using `pyb` instead of
`python_build` saves 9 characters.

---

`Distribution Tests Python Windows` failed because of 

`T:\altsrc\github\grpc\workspace_python_windows_x86_Python38_32bit\python_build\\temp.win-amd64-cpython-312\\Release\\src\core\ext\upb-gen\envoy\extensions\load_balancing_policies\client_side_weighted_round_robin\v3\client_side_weighted_round_robin.upb_minitable.obj`
@veblush veblush merged commit 016ed92 into grpc:master Nov 10, 2023
70 of 74 checks passed
eugeneo pushed a commit to eugeneo/grpc that referenced this pull request Nov 14, 2023
To mitigate the following windows long path issue found in
grpc#34513. Using `pyb` instead of
`python_build` saves 9 characters.

---

`Distribution Tests Python Windows` failed because of 

`T:\altsrc\github\grpc\workspace_python_windows_x86_Python38_32bit\python_build\\temp.win-amd64-cpython-312\\Release\\src\core\ext\upb-gen\envoy\extensions\load_balancing_policies\client_side_weighted_round_robin\v3\client_side_weighted_round_robin.upb_minitable.obj`
eugeneo pushed a commit to eugeneo/grpc that referenced this pull request Nov 14, 2023
This commit upgrades gRPC to protobuf v25.0 and makes some fixes to
account for upb changes. One major change is that upb has been merged
into the protobuf repo, so we can now drop the separate `@upb`
dependency. Another is that `.upb.c` files no longer exist and there are
new `.upb_minitable.h` and `.upb_minitable.c` files. The longer
filenames exceeded a Windows restriction, so to work around that I
renamed the `upb-generated` directory to just `upb-gen`, and likewise
for `upbdefs-generated`.
@veblush veblush added release notes: yes Indicates if PR needs to be in release notes and removed release notes: no Indicates if PR should not be in release notes labels Nov 14, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants