Skip to content
This repository was archived by the owner on Dec 8, 2021. It is now read-only.

Commit f1e2772

Browse files
devbwwdevbww
authored
ci: use gRPC-1.26.x to workaround a known bug (#1234)
Workaround grpc/grpc#21280 by compiling against a specific commit (without a tag) of the v1.26.x gRPC branch.
1 parent 4b9aa17 commit f1e2772

2 files changed

Lines changed: 29 additions & 22 deletions

File tree

‎INSTALL.md‎

Lines changed: 26 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,7 @@ wget -q https://github.com/google/benchmark/archive/v1.5.0.tar.gz && \
228228
cmake \
229229
-DCMAKE_BUILD_TYPE="Release" \
230230
-DBUILD_SHARED_LIBS=yes \
231+
-DBENCHMARK_ENABLE_TESTING=OFF \
231232
-H. -Bcmake-out && \
232233
cmake --build cmake-out -- -j ${NCPU:-4} && \
233234
sudo cmake --build cmake-out --target install -- -j ${NCPU:-4} && \
@@ -332,9 +333,9 @@ Cloud Platform proto files. We manually install it using:
332333

333334
```bash
334335
cd $HOME/Downloads
335-
wget -q https://github.com/grpc/grpc/archive/v1.23.1.tar.gz && \
336-
tar -xf v1.23.1.tar.gz && \
337-
cd grpc-1.23.1 && \
336+
wget -q https://github.com/grpc/grpc/archive/78ace4cd5dfcc1f2eced44d22d752f103f377e7b.tar.gz && \
337+
tar -xf 78ace4cd5dfcc1f2eced44d22d752f103f377e7b.tar.gz && \
338+
cd grpc-78ace4cd5dfcc1f2eced44d22d752f103f377e7b && \
338339
make -j ${NCPU:-4} && \
339340
sudo make install && \
340341
sudo ldconfig
@@ -383,6 +384,7 @@ wget -q https://github.com/google/benchmark/archive/v1.5.0.tar.gz && \
383384
cmake \
384385
-DCMAKE_BUILD_TYPE="Release" \
385386
-DBUILD_SHARED_LIBS=yes \
387+
-DBENCHMARK_ENABLE_TESTING=OFF \
386388
-H. -Bcmake-out && \
387389
cmake --build cmake-out -- -j ${NCPU:-4} && \
388390
sudo cmake --build cmake-out --target install -- -j ${NCPU:-4} && \
@@ -459,9 +461,9 @@ Cloud Platform proto files. We install it using:
459461

460462
```bash
461463
cd $HOME/Downloads
462-
wget -q https://github.com/grpc/grpc/archive/v1.23.1.tar.gz && \
463-
tar -xf v1.23.1.tar.gz && \
464-
cd grpc-1.23.1 && \
464+
wget -q https://github.com/grpc/grpc/archive/78ace4cd5dfcc1f2eced44d22d752f103f377e7b.tar.gz && \
465+
tar -xf 78ace4cd5dfcc1f2eced44d22d752f103f377e7b.tar.gz && \
466+
cd grpc-78ace4cd5dfcc1f2eced44d22d752f103f377e7b && \
465467
make -j ${NCPU:-4} && \
466468
sudo make install && \
467469
sudo ldconfig
@@ -510,6 +512,7 @@ wget -q https://github.com/google/benchmark/archive/v1.5.0.tar.gz && \
510512
cmake \
511513
-DCMAKE_BUILD_TYPE="Release" \
512514
-DBUILD_SHARED_LIBS=yes \
515+
-DBENCHMARK_ENABLE_TESTING=OFF \
513516
-H. -Bcmake-out && \
514517
cmake --build cmake-out -- -j ${NCPU:-4} && \
515518
sudo cmake --build cmake-out --target install -- -j ${NCPU:-4} && \
@@ -601,9 +604,9 @@ Cloud Platform proto files. We can install gRPC from source using:
601604

602605
```bash
603606
cd $HOME/Downloads
604-
wget -q https://github.com/grpc/grpc/archive/v1.23.1.tar.gz && \
605-
tar -xf v1.23.1.tar.gz && \
606-
cd grpc-1.23.1 && \
607+
wget -q https://github.com/grpc/grpc/archive/78ace4cd5dfcc1f2eced44d22d752f103f377e7b.tar.gz && \
608+
tar -xf 78ace4cd5dfcc1f2eced44d22d752f103f377e7b.tar.gz && \
609+
cd grpc-78ace4cd5dfcc1f2eced44d22d752f103f377e7b && \
607610
make -j ${NCPU:-4} && \
608611
sudo make install && \
609612
sudo ldconfig
@@ -652,6 +655,7 @@ wget -q https://github.com/google/benchmark/archive/v1.5.0.tar.gz && \
652655
cmake \
653656
-DCMAKE_BUILD_TYPE="Release" \
654657
-DBUILD_SHARED_LIBS=yes \
658+
-DBENCHMARK_ENABLE_TESTING=OFF \
655659
-H. -Bcmake-out && \
656660
cmake --build cmake-out -- -j ${NCPU:-4} && \
657661
sudo cmake --build cmake-out --target install -- -j ${NCPU:-4} && \
@@ -752,6 +756,7 @@ wget -q https://github.com/google/benchmark/archive/v1.5.0.tar.gz && \
752756
cmake \
753757
-DCMAKE_BUILD_TYPE="Release" \
754758
-DBUILD_SHARED_LIBS=yes \
759+
-DBENCHMARK_ENABLE_TESTING=OFF \
755760
-H. -Bcmake-out && \
756761
cmake --build cmake-out -- -j ${NCPU:-4} && \
757762
sudo cmake --build cmake-out --target install -- -j ${NCPU:-4} && \
@@ -835,9 +840,9 @@ Protobuf we just installed in `/usr/local`:
835840

836841
```bash
837842
cd $HOME/Downloads
838-
wget -q https://github.com/grpc/grpc/archive/v1.23.1.tar.gz && \
839-
tar -xf v1.23.1.tar.gz && \
840-
cd grpc-1.23.1 && \
843+
wget -q https://github.com/grpc/grpc/archive/78ace4cd5dfcc1f2eced44d22d752f103f377e7b.tar.gz && \
844+
tar -xf 78ace4cd5dfcc1f2eced44d22d752f103f377e7b.tar.gz && \
845+
cd grpc-78ace4cd5dfcc1f2eced44d22d752f103f377e7b && \
841846
make -j ${NCPU:-4} && \
842847
sudo make install && \
843848
sudo ldconfig
@@ -886,6 +891,7 @@ wget -q https://github.com/google/benchmark/archive/v1.5.0.tar.gz && \
886891
cmake \
887892
-DCMAKE_BUILD_TYPE="Release" \
888893
-DBUILD_SHARED_LIBS=yes \
894+
-DBENCHMARK_ENABLE_TESTING=OFF \
889895
-H. -Bcmake-out && \
890896
cmake --build cmake-out -- -j ${NCPU:-4} && \
891897
sudo cmake --build cmake-out --target install -- -j ${NCPU:-4} && \
@@ -974,9 +980,9 @@ Cloud Platform proto files. We manually install it using:
974980

975981
```bash
976982
cd $HOME/Downloads
977-
wget -q https://github.com/grpc/grpc/archive/v1.23.1.tar.gz && \
978-
tar -xf v1.23.1.tar.gz && \
979-
cd grpc-1.23.1 && \
983+
wget -q https://github.com/grpc/grpc/archive/78ace4cd5dfcc1f2eced44d22d752f103f377e7b.tar.gz && \
984+
tar -xf 78ace4cd5dfcc1f2eced44d22d752f103f377e7b.tar.gz && \
985+
cd grpc-78ace4cd5dfcc1f2eced44d22d752f103f377e7b && \
980986
make -j ${NCPU:-4} && \
981987
sudo make install && \
982988
sudo ldconfig
@@ -1025,6 +1031,7 @@ wget -q https://github.com/google/benchmark/archive/v1.5.0.tar.gz && \
10251031
cmake \
10261032
-DCMAKE_BUILD_TYPE="Release" \
10271033
-DBUILD_SHARED_LIBS=yes \
1034+
-DBENCHMARK_ENABLE_TESTING=OFF \
10281035
-H. -Bcmake-out && \
10291036
cmake --build cmake-out -- -j ${NCPU:-4} && \
10301037
sudo cmake --build cmake-out --target install -- -j ${NCPU:-4} && \
@@ -1134,9 +1141,9 @@ Cloud Platform proto files. We manually install it using:
11341141

11351142
```bash
11361143
cd $HOME/Downloads
1137-
wget -q https://github.com/grpc/grpc/archive/v1.23.1.tar.gz && \
1138-
tar -xf v1.23.1.tar.gz && \
1139-
cd grpc-1.23.1 && \
1144+
wget -q https://github.com/grpc/grpc/archive/78ace4cd5dfcc1f2eced44d22d752f103f377e7b.tar.gz && \
1145+
tar -xf 78ace4cd5dfcc1f2eced44d22d752f103f377e7b.tar.gz && \
1146+
cd grpc-78ace4cd5dfcc1f2eced44d22d752f103f377e7b && \
11401147
make -j ${NCPU:-4} && \
11411148
sudo make install && \
11421149
sudo ldconfig
@@ -1185,6 +1192,7 @@ wget -q https://github.com/google/benchmark/archive/v1.5.0.tar.gz && \
11851192
cmake \
11861193
-DCMAKE_BUILD_TYPE="Release" \
11871194
-DBUILD_SHARED_LIBS=yes \
1195+
-DBENCHMARK_ENABLE_TESTING=OFF \
11881196
-H. -Bcmake-out && \
11891197
cmake --build cmake-out -- -j ${NCPU:-4} && \
11901198
sudo cmake --build cmake-out --target install -- -j ${NCPU:-4} && \

‎bazel/google_cloud_cpp_spanner_deps.bzl‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,11 @@ def google_cloud_cpp_spanner_deps():
8888
if "com_github_grpc_grpc" not in native.existing_rules():
8989
http_archive(
9090
name = "com_github_grpc_grpc",
91-
strip_prefix = "grpc-1.24.2",
91+
strip_prefix = "grpc-78ace4cd5dfcc1f2eced44d22d752f103f377e7b",
9292
urls = [
93-
"https://github.com/grpc/grpc/archive/v1.24.2.tar.gz",
94-
"https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.24.2.tar.gz",
93+
"https://github.com/grpc/grpc/archive/78ace4cd5dfcc1f2eced44d22d752f103f377e7b.tar.gz",
9594
],
96-
sha256 = "fd040f5238ff1e32b468d9d38e50f0d7f8da0828019948c9001e9a03093e1d8f",
95+
sha256 = "a2034a1c8127e35c0cc7b86c1b5ad6d8e79a62c5e133c379b8b22a78ba370015",
9796
)
9897

9998
# We use the cc_proto_library() rule from @com_google_protobuf, which

0 commit comments

Comments
 (0)