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

Update third_party/protobuf to 3.21.12 #32136

Merged
merged 6 commits into from
Jan 20, 2023

Conversation

jtattermusch
Copy link
Contributor

@jtattermusch jtattermusch commented Jan 18, 2023

Change was created by the release automation script. See go/grpc-release

  • a few manual fixes have been added.
  • Even though "protobuf@master" is currently broken, it's probably a good idea to upgrade protobuf to the latest released version in order to minimize the diff.

@jtattermusch
Copy link
Contributor Author

jtattermusch commented Jan 19, 2023

The sanity test error seem to be due to a design flaw in check_protobuf_pod_version.sh which, takes version1=$(git describe --tags | cut -f 1 -d'-') - which currently evaluates to v21.12 due to the change in protobuf versioning scheme.

+ '[' 21.12 '!=' 3.21.12 ']'
+ echo 'Protobuf version in src/objective-c/!ProtoCompiler.podspec does not match protobuf version in third_party/protobuf.'
Protobuf version in src/objective-c/!ProtoCompiler.podspec does not match protobuf version in third_party/protobuf.

@jtattermusch
Copy link
Contributor Author

@jtattermusch jtattermusch changed the title TEST ONLY: Update third_party/protobuf to 3.21.12 Update third_party/protobuf to 3.21.12 Jan 19, 2023
@jtattermusch jtattermusch marked this pull request as ready for review January 19, 2023 13:51
@jtattermusch
Copy link
Contributor Author

CC @sampajano for the check_protobuf_pod_version.sh fix.

@sampajano
Copy link
Contributor

CC @sampajano for the check_protobuf_pod_version.sh fix.

Thanks for cc! I'm not very familiar with protobuf versioning but i suppose this "3.x.y" format won't work forever.. hence i've added a comment for you to link to the source of why you're making this change so we can update it in the future when appropriate. Thanks!

Copy link
Contributor

@sampajano sampajano left a comment

Choose a reason for hiding this comment

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

Thanks a lot for the change! iOS related change LGTM thanks!

@jtattermusch jtattermusch merged commit dafcb3b into grpc:master Jan 20, 2023
@copybara-service copybara-service bot added the imported Specifies if the PR has been imported to the internal repository label Jan 20, 2023
XuanWang-Amos pushed a commit to XuanWang-Amos/grpc that referenced this pull request May 1, 2023
* Update third_party/protobuf

* run tools/distrib/python/make_grpcio_tools.py

* update build_handwritten.yaml

* regenerate projects

* manual change: fix tools/distrib/check_protobuf_pod_version.sh to accept new-style protobuf tags

* improve comments for check_protobuf_pod_version hack
wanlin31 pushed a commit that referenced this pull request May 18, 2023
* Update third_party/protobuf

* run tools/distrib/python/make_grpcio_tools.py

* update build_handwritten.yaml

* regenerate projects

* manual change: fix tools/distrib/check_protobuf_pod_version.sh to accept new-style protobuf tags

* improve comments for check_protobuf_pod_version hack
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bloat/none imported Specifies if the PR has been imported to the internal repository lang/all wrapped languages per-call-memory/neutral per-channel-memory/neutral release notes: yes Indicates if PR needs to be in release notes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants