Skip to content

Uses sources.json from BoringSSL#23568

Merged
lidizheng merged 2 commits intogrpc:masterfrom
emkornfield:use_sources
Jul 27, 2020
Merged

Uses sources.json from BoringSSL#23568
lidizheng merged 2 commits intogrpc:masterfrom
emkornfield:use_sources

Conversation

@emkornfield
Copy link
Copy Markdown
Contributor

This change undoes some hackiness that relied
on specifics of the BoringSSL build system to
generate source files. With the latest github
mirror of BoringSSL exports a sources.json
that lists all source code files. This change
makes use of that file.

I ran "./tools/buildgen/generate_projects.sh" and no changes are
generated with this change.

@lidizheng @jtattermusch

This change undoes some hackiness that relied
on specifics of the BoringSSL build system to
generate source files. With the latest github
mirror of BoringSSL exports a sources.json
that lists all source code files. This change
makes use of that file.
@lidizheng lidizheng requested a review from jtattermusch July 21, 2020 17:42
@lidizheng lidizheng added lang/Python release notes: no Indicates if PR should not be in release notes kokoro:run labels Jul 21, 2020
@emkornfield
Copy link
Copy Markdown
Contributor Author

Locally sanity tests seem to be failing on format issues. I'm trying to fix them.

@emkornfield
Copy link
Copy Markdown
Contributor Author

Actually format issues looks like it is for an unrelated file: "./test/cpp/qps/json_run_localhost_scenarios.bzl"

@lidizheng
Copy link
Copy Markdown
Contributor

Can you rerun the generation script? Sometimes I see the formatting complain of that file. If the complain persists, can you share the log?

@emkornfield
Copy link
Copy Markdown
Contributor Author

Can you rerun the generation script? Sometimes I see the formatting complain of that file. If the complain persists, can you share the log?

I reran: ./tools/buildgen/generate_projects.sh but sanity check (python tools/run_tests/run_tests.py --use_docker -j 16 -l sanity -c dbg) still fails locally. It looks like it passed as part of CI though, so this might just be an environment issue on my side.

Copy link
Copy Markdown
Contributor

@lidizheng lidizheng left a comment

Choose a reason for hiding this comment

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

LGTM. @jtattermusch Can you please also take a look?

@lidizheng
Copy link
Copy Markdown
Contributor

Going ahead to merge this PR since all tests in CI passes. I hope the BoringSSL optimization can be included in our next release. The time until next release should give us a chance to catch potential issue.

@lidizheng
Copy link
Copy Markdown
Contributor

@emkornfield Awkwardly, the boringssl-with-bazel library is not available in google3. But the gen_build_yamp.py needs to be ran in both environments. Can you create a roll forward PR without directly depending on sources.json? Or we need to import the boringssl-with-bazel to third_party?

@emkornfield
Copy link
Copy Markdown
Contributor Author

@lidizheng can you clarify if output is important or just a non zero exit code

@lidizheng
Copy link
Copy Markdown
Contributor

The output is important. It generates the yaml file that both Bazel and Blaze reads.

@emkornfield
Copy link
Copy Markdown
Contributor Author

Can you send directions on how to test in google3

@lidizheng
Copy link
Copy Markdown
Contributor

@emkornfield There isn't a straightforward way to test this.

If a PR is merged. You can initiate an import by running /home/build/google3/third_party/grpc/copybara_import.sh. Its documentation is at go/grpc-import. This script imports newly merged code from GitHub to google3.

Or you can create a one PR import CL from go/grpc-cherrypick. It's a bit more complex, since it needs to get the ref commit hash for rebase. This approach only works for unmerged PRs.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

lang/Python release notes: no Indicates if PR should not be in release notes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants