From 84278dced4b46a93c64edbd37e1b234328cbebd8 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Tue, 7 Jul 2020 11:28:33 +0200 Subject: [PATCH 1/2] fix nits in third_party/README.md --- third_party/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/third_party/README.md b/third_party/README.md index fc035cb814c..4294af5f02d 100644 --- a/third_party/README.md +++ b/third_party/README.md @@ -80,15 +80,15 @@ Rule 'boringssl' indicated that a canonical reproducible form can be obtained by - Update `bazel/grpc_deps.bzl` with the SHA value shown in the above debug msg. Commit again `git commit -m "Updated sha256"` - Run `tools/distrib/generate_boringssl_prefix_header.sh` - - Commit again `commit -m "generate boringssl prefix headers"` + - Commit again `git commit -m "generate boringssl prefix headers"` - Increment the boringssl podspec version number in `templates/src/objective-c/BoringSSL-GRPC.podspec.template` and `templates/gRPC-Core.podspec.template`. [example](https://github.com/grpc/grpc/pull/21527/commits/9d4411842f02f167209887f1f3d2b9ab5d14931a) - - Commit again `commit -m "Increment podspec version"` + - Commit again `git commit -m "Increment podspec version"` - Run `tools/buildgen/generate_projects.sh` (yes, again) - - Commit again `commit -m "Second regeneration"` + - Commit again `git commit -m "Second regeneration"` - Create a PR with all the above commits. From 6905146faef3ce4e9b933be8fc1ae1dba9871eb2 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Tue, 7 Jul 2020 11:46:51 +0200 Subject: [PATCH 2/2] Update README.md --- third_party/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/README.md b/third_party/README.md index 4294af5f02d..9bf04831bcb 100644 --- a/third_party/README.md +++ b/third_party/README.md @@ -65,7 +65,7 @@ git commit -m "update submodule boringssl-with-bazel with origin/master-with-baz - Update boringssl dependency in `bazel/grpc_deps.bzl` to the same commit SHA as master-with-bazel branch - Update `http_archive(name = "boringssl",` section by updating the sha in `strip_prefix` and `urls` fields. - - Also, set `sha256` field to “” as the existing value is not valid. This will be added later once we know what that value is. + - Also, set `sha256` field to "" as the existing value is not valid. This will be added later once we know what that value is. - Update `tools/run_tests/sanity/check_submodules.sh` with the same commit