Skip to content

25.x aarch64 cherry pick #20292

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

Merged
merged 3 commits into from
Feb 10, 2025
Merged

25.x aarch64 cherry pick #20292

merged 3 commits into from
Feb 10, 2025

Conversation

JasonLunn
Copy link
Contributor

#test-continuous

JasonLunn and others added 3 commits November 13, 2023 13:05
Rewrrte and extension of #12828, with additional work for JRuby. Partially fixes #1198 by adding support for custom options. Handling of extensions will be handled in a follow up.

Also includes these unrelated fixes:
* Removes code echo between `google/protobuf/repeated_field.rb` and `google/protobuf/ffi/repeated_field.rb` by `require`'ing the former in the latter.
* Adds missing calles to `testFrozen()` from methods of `RepeatedField` under JRuby that mutate.
* Various typos in comments.

Closes #14594

COPYBARA_INTEGRATE_REVIEW=#14594 from protocolbuffers:add-support-for-options-in-ruby 16cc9e3
PiperOrigin-RevId: 580848874
# Conflicts:
#	ruby/ext/google/protobuf_c/message.c
#	ruby/lib/google/protobuf/ffi/descriptor_pool.rb
#	ruby/tests/basic.rb
#	ruby/tests/basic_test.proto
@JasonLunn JasonLunn requested a review from a team as a code owner February 10, 2025 15:47
@JasonLunn JasonLunn requested review from deannagarcia and removed request for a team February 10, 2025 15:47
@deannagarcia deannagarcia merged commit 8cc8675 into 25.x Feb 10, 2025
151 checks passed
@deannagarcia deannagarcia deleted the 25.x-aarch64-cherry-pick branch February 10, 2025 17:42
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.

3 participants