-
Notifications
You must be signed in to change notification settings - Fork 10.5k
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
De-duplicate .proto file processing #20537
Conversation
a ton of tests are failing
|
We will also have to make corresponding changes to |
It looks like this is happening because |
Argh. |
And it doesn't look like there's a good way to merge two static libraries into one. Unfortunately, this means I will probably have to revert to the original plan of using |
106add7
to
6b46a53
Compare
Looks like part of the problem was that the .proto files in question were being generated by three different |
6b46a53
to
bae2a8f
Compare
@tudor Please try this and let me know if it works for you. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I spawned the tests - let's see what they say.
Also added a few comments.
bae2a8f
to
9186c3d
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
One last nit and then we're good to go I think.
Ok, and sanity check fails because CMakeLists.txt hasn't been regenerated? https://source.cloud.google.com/results/invocations/10729965-08e3-4676-8987-b5451dc045e7/targets/github%2Fgrpc%2Frun_tests%2Fsanity_linux_dbg_native%2Ftools%2Fbuildgen%2Fgenerate_projects.sh/tests |
.proto files that are used by more than one target have their code files generated multiple times, which causes issues with add_custom_command(). De-duplicate them so they're only generated once.
9186c3d
to
b94dd62
Compare
Weird. I'm guessing this was probably because it was several hundred commits behind on |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM (once tests pass)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
.proto files that are used by more than one target have their code
files generated multiple times, which causes issues with
add_custom_command(). De-duplicate them so they're only generated
once.
Fixes: #12379
@nicolasnoble
@zackgalbreath