Merge 3.19.x into master #9169
Merge 3.19.x into master #9169
Conversation
This commit removes the use of bind() since that function goes against Bazel best practices: https://docs.bazel.build/versions/main/external.html#repository-rules-1 The bind() function basically maps a dependency into //external, but there is no good reason to do this. By mapping dependencies into //external and relying on this in our own BUILD files, we're forcing projects that depend on us to do the same. The one bind() call that I did leave in place was //:python_headers. This one seems to be doing something complicated I don't fully understand, and I don't want to risk breaking it. This change also moves our list of required Maven artifacts into a constant in protobuf_deps.bzl. This way, projects that depend on us can refer to this list when they invoke maven_install() and automatically pull in all the necesary dependencies. This fixes #9132.
If the line above raises an exception, the upb_arena is lost and memory is leaked.
I also updated CHANGES.txt to include a couple things I forgot to add for 3.19.0.
Cherry-pick fixes for 3.19.1 and update change log
|
All (the pull request submitter and all commit authors) CLAs are signed, but one or more commits were authored or co-authored by someone other than the pull request submitter. We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that by leaving a comment that contains only Note to project maintainer: There may be cases where the author cannot leave a comment, or the comment is not properly detected as consent. In those cases, you can manually confirm consent of the commit author(s), and set the ℹ️ Googlers: Go here for more info. |
|
The CLA is OK because these commits have already gone through the CLA process. |
|
Kokoro failures are worth a look: cc1plus: warning: command line option ‘-Wstrict-prototypes’ is valid for C/ObjC but not for C++ [enabled by default] |
|
I think that failure is actually a weird artifact of Kokoro and is not related to this change. It's a continuous benchmark run rather than a presubmit check, and it has already been failing for a while. |
|
The Python benchmark error will hopefully be fixed by #9170. |
|
Sound good. Running the tests now. |
|
All (the pull request submitter and all commit authors) CLAs are signed, but one or more commits were authored or co-authored by someone other than the pull request submitter. We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that by leaving a comment that contains only Note to project maintainer: There may be cases where the author cannot leave a comment, or the comment is not properly detected as consent. In those cases, you can manually confirm consent of the commit author(s), and set the ℹ️ Googlers: Go here for more info. |
There was a problem hiding this comment.
strangely now ruby is failing:
Loaded suite /usr/local/rvm/rubies/jruby-9.3.0.0/lib/ruby/gems/shared/gems/rake-13.0.6/lib/rake/rake_test_loader
Started
...........F
===============================================================================
Failure: test_hash(BasicTest::MessageContainerTest): <false> is not true.
/tmp/protobuf/protobuf/ruby/compatibility_tests/v3.0.0/tests/basic.rb:190:in `test_hash'
187: assert m2.hash != 0
188: # relying on the randomness here -- if hash function changes and we are
189: # unlucky enough to get a collision, then change the values above.
=> 190: assert m1.hash != m2.hash
191: end
192:
193: def test_unknown_field_errors
org/jruby/RubyKernel.java:1237:in `catch'
org/jruby/RubyKernel.java:1232:in `catch'
org/jruby/RubyKernel.java:1237:in `catch'
org/jruby/RubyKernel.java:1232:in `catch'
|
I think that test failure must have been a flake. I reran the test and now it is passing. |
Merge 3.19.x into master
No description provided.