Skip to content

Commit bd96a9c

Browse files
bmd3kdna2github
authored andcommitted
Make grpc.patch instructions more accurate. (tensorflow#5795)
As noted in a comment for tensorflow#5793, the instructions for generating grpc.patch would be more accurate if they referred to the commit that corresponds to the grpc archive instead of referring to the nearest tag. I've updated the instructions to refer to the commit. I tested by following the updated instructions and copying grpc.patch to my tensorboard repo. git did not find a diff in the generated files.
1 parent 40ac196 commit bd96a9c

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

WORKSPACE

+6-5
Original file line numberDiff line numberDiff line change
@@ -149,14 +149,15 @@ http_archive(
149149
# ```
150150
# $ git clone https://github.com/grpc/grpc.git
151151
# $ cd grpc
152-
# $ git checkout tags/v1.27.0-pre1 -b my-patch
152+
# $ git checkout b54a5b338637f92bfcf4b0bc05e0f57a5fd8fadd -b my-patch
153153
# $ git cherry-pick dbe73c9004e483d24168c220cd589fe1824e72bc
154154
# $ git diff HEAD~1 > grpc.patch
155155
# ```
156156
#
157-
# Note that we choose tags/v1.27.0-pre1 as the base since the version in
158-
# the archive is 1.27.0-dev. It's not necessarily an exact match but is
159-
# the best guess we can make for a match.
157+
# Note that we choose b54a5b338637f92bfcf4b0bc05e0f57a5fd8fadd as the
158+
# base since it matches the archive (the commit number is in the archive
159+
# file's name). There is no exact corresponding tag to use but the
160+
# nearest might be v1.27.0-pre1.
160161
"//third_party:grpc.patch",
161162
],
162163
sha256 = "b956598d8cbe168b5ee717b5dafa56563eb5201a947856a6688bbeac9cac4e1f",
@@ -166,7 +167,7 @@ http_archive(
166167
# Currently we can't upgrade gRPC past 1.30.0 without also bumping protobuf to 3.12.0+:
167168
# https://github.com/grpc/grpc/issues/23311.
168169
#
169-
# Inspecting the contents of this archive, the version is 1.27.0-dev.
170+
# Inspecting the contents of this archive, the version is v1.27.0-dev.
170171
"http://mirror.tensorflow.org/github.com/grpc/grpc/archive/b54a5b338637f92bfcf4b0bc05e0f57a5fd8fadd.tar.gz",
171172
"https://github.com/grpc/grpc/archive/b54a5b338637f92bfcf4b0bc05e0f57a5fd8fadd.tar.gz",
172173
],

0 commit comments

Comments
 (0)