forked from protocolbuffers/protobuf
-
Notifications
You must be signed in to change notification settings - Fork 0
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
[PLAT-741] Updating fork #4
Open
fedeberco
wants to merge
3,755
commits into
wearefair:master
Choose a base branch
from
protocolbuffers:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The macro ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX changed in 7.2, so it cannot be used in a compatible way with earlier versions
Adding kotlin bazel tests
instead of using the void return type, add more ReturnTypeWillChange annotations
Change the location of the llvm-ar tool to match the new docker container.
Update location of llvm-ar in bazel toolchain
Migrate kotlin bazel tests from kt_jvm_test
Otherwise in C++20 / VisualStudio 2022 the following warning is emitted: ``` warning C5054: operator '*': deprecated between enumerations of different types ```
when using CMake >= 3.15, we use CMAKE_MSVC_RUNTIME_LIBRARY to reproduce the /MT vs /MD when protobuf_MSVC_STATIC_RUNTIME is TRUE or FALSE MultiThreaded is for /MT MultiThreadedDebug is for /MTd MultiThreadedDLL is for /MD MultiThreadedDebugDLL is for /MDd
Updated Ruby to the current version of upb
I think it _should_ be required, but a test (linux, 32bit, 7.0-zts) is choking on composer install, so putting things back to how I found them
@gnossen gave a great overview in grpc/grpc#24992 of the overall problem. If a python process using both protobuf _and_ another native library linking in libprotobuf frequently can cause crashes. This seems to frequently affect tensorflow as well: tensorflow/tensorflow#8394, tensorflow/tensorflow#9525 (comment) tensorflow/tensorflow#24976, tensorflow/tensorflow#35573, https://github.com/tensorflow/tensorflow/blob/v2.0.0/tensorflow/contrib/makefile/rename_protobuf.sh, tensorflow/tensorflow#16104 Testing locally this fixes both crashes when linking in multiple versions of protobuf and fixes `DescriptorPool` clashes as well (e.g. Python and Native code import different versions of the same message). Co-authored-by: Roy Williams <roy.williams.iii@gmail.com>
The previously used term "3-Clause BSD License" is not properly standarized. A common standard is SPDX, therefore "3-Clause BSD License" is substituted with "BSD-3-Clause" which is a SPDX identifier. `grep -rl "3-Clause BSD License" | xargs -n1 sed -i "s/3-Clause BSD License/BSD-3-Clause/g"`
Fix NPE during encoding and add regression test for issue 9507.
* Fix invalid dependency manifest when using `descriptor_set_out` * Put the descriptor file in the temp directory so it gets deleted
Integrate from Piper for C++, Java, and Python
PROTOBUF_SYNC_PIPER
Integrate from Piper for C++, Java, and Python Note that this renames several source files under src/google/protobuf/compiler.
* .NET 5 reaches end-of-support in May, so update the Benchmarks project to `net6.0` * Update some NuGet packages to latest.
Nicer experience for e.g. VS Code
All synthetic methods implemented by `method_missing` are now supported by `respond_to?`. Fixes issue #9202. * Fix null pointer exceptions exposed by new regression tests. * Fix clear_ on oneofs so that it is safe to call repeatedly and so that respond_to? does not depend on whether the oneof is currently cleared. * Code cleanup: reenable more tests on JRuby. * Align JRuby behavior with CRuby by throwing a RuntimeError when attempting to assign to a oneof.
Cleanup warnings seen when running tests.
…-format Run all JRuby source files through `google-java-format.`
Reverting change to target frameworks that breaks kokoro
This commit should have no non-whitespace changes Fixes #9526 (in terms of content)
This change adds separate libraries for common test utilities and test proto definitions, which are shared by different test targets. Without this change, cmake fails when generating Xcode files with the error: ``` CMake Error in CMakeLists.txt: The custom command generating .../protobuf/src/google/protobuf/unittest_lite.pb.cc is attached to multiple targets: tests lite-test lite-arena-test but none of these is a common dependency of the other(s). This is not allowed by the Xcode "new build system". ```
Add JRuby 9.3.4.0 to Dockerfile and use it for 9.3.x testing.
This build will be used to troubleshoot building on a newer macOS image. Once it is stable, this config will replace the "macos" build.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ticket URL
https://faircorp.atlassian.net/browse/PLAT-741
Description
Updating fork with latest changes