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

Commit 21c93a8

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

7 files changed

Lines changed: 21 additions & 20 deletions

File tree

ci/kokoro/install/Dockerfile.centos-7

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,9 @@ RUN wget -q https://github.com/c-ares/c-ares/archive/cares-1_14_0.tar.gz && \
9393

9494
# ```bash
9595
WORKDIR /var/tmp/build
96-
RUN wget -q https://github.com/grpc/grpc/archive/v1.23.1.tar.gz && \
97-
tar -xf v1.23.1.tar.gz && \
98-
cd grpc-1.23.1 && \
96+
RUN wget -q https://github.com/grpc/grpc/archive/78ace4cd5dfcc1f2eced44d22d752f103f377e7b.tar.gz && \
97+
tar -xf 78ace4cd5dfcc1f2eced44d22d752f103f377e7b.tar.gz && \
98+
cd grpc-78ace4cd5dfcc1f2eced44d22d752f103f377e7b && \
9999
make -j ${NCPU:-4} && \
100100
make install && \
101101
ldconfig

ci/kokoro/install/Dockerfile.centos-8

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ RUN wget -q https://github.com/google/protobuf/archive/v3.9.1.tar.gz && \
7272

7373
# ```bash
7474
WORKDIR /var/tmp/build
75-
RUN wget -q https://github.com/grpc/grpc/archive/v1.23.1.tar.gz && \
76-
tar -xf v1.23.1.tar.gz && \
77-
cd grpc-1.23.1 && \
75+
RUN wget -q https://github.com/grpc/grpc/archive/78ace4cd5dfcc1f2eced44d22d752f103f377e7b.tar.gz && \
76+
tar -xf 78ace4cd5dfcc1f2eced44d22d752f103f377e7b.tar.gz && \
77+
cd grpc-78ace4cd5dfcc1f2eced44d22d752f103f377e7b && \
7878
make -j ${NCPU:-4} && \
7979
make install && \
8080
ldconfig

ci/kokoro/install/Dockerfile.debian-stretch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ RUN wget -q https://github.com/google/protobuf/archive/v3.9.1.tar.gz && \
6767

6868
# ```bash
6969
WORKDIR /var/tmp/build
70-
RUN wget -q https://github.com/grpc/grpc/archive/v1.23.1.tar.gz && \
71-
tar -xf v1.23.1.tar.gz && \
72-
cd grpc-1.23.1 && \
70+
RUN wget -q https://github.com/grpc/grpc/archive/78ace4cd5dfcc1f2eced44d22d752f103f377e7b.tar.gz && \
71+
tar -xf 78ace4cd5dfcc1f2eced44d22d752f103f377e7b.tar.gz && \
72+
cd grpc-78ace4cd5dfcc1f2eced44d22d752f103f377e7b && \
7373
make -j ${NCPU:-4} && \
7474
make install && \
7575
ldconfig

ci/kokoro/install/Dockerfile.opensuse-leap

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,9 @@ RUN wget -q https://github.com/c-ares/c-ares/archive/cares-1_14_0.tar.gz && \
8888

8989
# ```bash
9090
WORKDIR /var/tmp/build
91-
RUN wget -q https://github.com/grpc/grpc/archive/v1.23.1.tar.gz && \
92-
tar -xf v1.23.1.tar.gz && \
93-
cd grpc-1.23.1 && \
91+
RUN wget -q https://github.com/grpc/grpc/archive/78ace4cd5dfcc1f2eced44d22d752f103f377e7b.tar.gz && \
92+
tar -xf 78ace4cd5dfcc1f2eced44d22d752f103f377e7b.tar.gz && \
93+
cd grpc-78ace4cd5dfcc1f2eced44d22d752f103f377e7b && \
9494
make -j ${NCPU:-4} && \
9595
make install && \
9696
ldconfig

ci/kokoro/install/Dockerfile.ubuntu-bionic

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ RUN wget -q https://github.com/google/protobuf/archive/v3.9.1.tar.gz && \
6060

6161
# ```bash
6262
WORKDIR /var/tmp/build
63-
RUN wget -q https://github.com/grpc/grpc/archive/v1.23.1.tar.gz && \
64-
tar -xf v1.23.1.tar.gz && \
65-
cd grpc-1.23.1 && \
63+
RUN wget -q https://github.com/grpc/grpc/archive/78ace4cd5dfcc1f2eced44d22d752f103f377e7b.tar.gz && \
64+
tar -xf 78ace4cd5dfcc1f2eced44d22d752f103f377e7b.tar.gz && \
65+
cd grpc-78ace4cd5dfcc1f2eced44d22d752f103f377e7b && \
6666
make -j ${NCPU:-4} && \
6767
make install && \
6868
ldconfig

ci/kokoro/install/Dockerfile.ubuntu-xenial

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ RUN wget -q https://github.com/c-ares/c-ares/archive/cares-1_14_0.tar.gz && \
7575

7676
# ```bash
7777
WORKDIR /var/tmp/build
78-
RUN wget -q https://github.com/grpc/grpc/archive/v1.23.1.tar.gz && \
79-
tar -xf v1.23.1.tar.gz && \
80-
cd grpc-1.23.1 && \
78+
RUN wget -q https://github.com/grpc/grpc/archive/78ace4cd5dfcc1f2eced44d22d752f103f377e7b.tar.gz && \
79+
tar -xf 78ace4cd5dfcc1f2eced44d22d752f103f377e7b.tar.gz && \
80+
cd grpc-78ace4cd5dfcc1f2eced44d22d752f103f377e7b && \
8181
make -j ${NCPU:-4} && \
8282
make install && \
8383
ldconfig

super/external/grpc.cmake

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,10 @@ if (NOT TARGET grpc-project)
2323
# Give application developers a hook to configure the version and hash
2424
# downloaded from GitHub.
2525
set(GOOGLE_CLOUD_CPP_GRPC_URL
26-
"https://github.com/grpc/grpc/archive/v1.24.3.tar.gz")
26+
"https://github.com/grpc/grpc/archive/78ace4cd5dfcc1f2eced44d22d752f103f377e7b.tar.gz"
27+
)
2728
set(GOOGLE_CLOUD_CPP_GRPC_SHA256
28-
"c84b3fa140fcd6cce79b3f9de6357c5733a0071e04ca4e65ba5f8d306f10f033")
29+
"a2034a1c8127e35c0cc7b86c1b5ad6d8e79a62c5e133c379b8b22a78ba370015")
2930

3031
set_external_project_build_parallel_level(PARALLEL)
3132
set_external_project_vars()

0 commit comments

Comments
 (0)