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

Commit 391ac2f

Browse files
coryancoryan
authored
ci: use protobuf-3.11.3 in the builds and docs (#151)
We need protobuf-3.11.3 to successfully compile the latest and greatest protos on Windows.
1 parent e7dd4c2 commit 391ac2f

File tree

14 files changed

+67
-59
lines changed

14 files changed

+67
-59
lines changed

‎INSTALL.md‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -298,9 +298,9 @@ Google Cloud Platform proto files:
298298

299299
```bash
300300
cd $HOME/Downloads
301-
wget -q https://github.com/google/protobuf/archive/v3.9.1.tar.gz && \
302-
tar -xf v3.9.1.tar.gz && \
303-
cd protobuf-3.9.1/cmake && \
301+
wget -q https://github.com/google/protobuf/archive/v3.11.3.tar.gz && \
302+
tar -xf v3.11.3.tar.gz && \
303+
cd protobuf-3.11.3/cmake && \
304304
cmake \
305305
-DCMAKE_BUILD_TYPE=Release \
306306
-DBUILD_SHARED_LIBS=yes \
@@ -404,9 +404,9 @@ Google Cloud Platform proto files:
404404

405405
```bash
406406
cd $HOME/Downloads
407-
wget -q https://github.com/google/protobuf/archive/v3.9.1.tar.gz && \
408-
tar -xf v3.9.1.tar.gz && \
409-
cd protobuf-3.9.1/cmake && \
407+
wget -q https://github.com/google/protobuf/archive/v3.11.3.tar.gz && \
408+
tar -xf v3.11.3.tar.gz && \
409+
cd protobuf-3.11.3/cmake && \
410410
cmake \
411411
-DCMAKE_BUILD_TYPE=Release \
412412
-DBUILD_SHARED_LIBS=yes \
@@ -495,9 +495,9 @@ Google Cloud Platform proto files:
495495

496496
```bash
497497
cd $HOME/Downloads
498-
wget -q https://github.com/google/protobuf/archive/v3.9.1.tar.gz && \
499-
tar -xf v3.9.1.tar.gz && \
500-
cd protobuf-3.9.1/cmake && \
498+
wget -q https://github.com/google/protobuf/archive/v3.11.3.tar.gz && \
499+
tar -xf v3.11.3.tar.gz && \
500+
cd protobuf-3.11.3/cmake && \
501501
cmake \
502502
-DCMAKE_BUILD_TYPE=Release \
503503
-DBUILD_SHARED_LIBS=yes \
@@ -672,9 +672,9 @@ Google Cloud Platform proto files:
672672

673673
```bash
674674
cd $HOME/Downloads
675-
wget -q https://github.com/google/protobuf/archive/v3.9.1.tar.gz && \
676-
tar -xf v3.9.1.tar.gz && \
677-
cd protobuf-3.9.1/cmake && \
675+
wget -q https://github.com/google/protobuf/archive/v3.11.3.tar.gz && \
676+
tar -xf v3.11.3.tar.gz && \
677+
cd protobuf-3.11.3/cmake && \
678678
cmake \
679679
-DCMAKE_BUILD_TYPE=Release \
680680
-DBUILD_SHARED_LIBS=yes \
@@ -775,9 +775,9 @@ Google Cloud Platform proto files:
775775

776776
```bash
777777
cd $HOME/Downloads
778-
wget -q https://github.com/google/protobuf/archive/v3.9.1.tar.gz && \
779-
tar -xf v3.9.1.tar.gz && \
780-
cd protobuf-3.9.1/cmake && \
778+
wget -q https://github.com/google/protobuf/archive/v3.11.3.tar.gz && \
779+
tar -xf v3.11.3.tar.gz && \
780+
cd protobuf-3.11.3/cmake && \
781781
cmake \
782782
-DCMAKE_BUILD_TYPE=Release \
783783
-DBUILD_SHARED_LIBS=yes \
@@ -884,9 +884,9 @@ Google Cloud Platform proto files:
884884

885885
```bash
886886
cd $HOME/Downloads
887-
wget -q https://github.com/google/protobuf/archive/v3.9.1.tar.gz && \
888-
tar -xf v3.9.1.tar.gz && \
889-
cd protobuf-3.9.1/cmake && \
887+
wget -q https://github.com/google/protobuf/archive/v3.11.3.tar.gz && \
888+
tar -xf v3.11.3.tar.gz && \
889+
cd protobuf-3.11.3/cmake && \
890890
cmake \
891891
-DCMAKE_BUILD_TYPE=Release \
892892
-DBUILD_SHARED_LIBS=yes \

‎README.md‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,10 +156,11 @@ The libraries also depend on gRPC, libcurl, and the dependencies of those
156156
libraries. The Google Cloud C++ Client libraries are tested with the following
157157
versions of these dependencies:
158158

159-
| Library | Minimum version |
160-
| ------- | --------------- |
161-
| gRPC | v1.16.x |
162-
| libcurl | 7.47.0 |
159+
| Library | Minimum version |
160+
| -------- | --------------- |
161+
| protobuf | v3.11.3 |
162+
| gRPC | v1.26.x |
163+
| libcurl | 7.47.0 |
163164

164165
#### Tests
165166

‎WORKSPACE‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,6 @@ load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")
3333

3434
grpc_deps()
3535

36-
# Call the workspace dependency functions defined, but not invoked, in grpc_deps.bzl.
37-
load("@upb//bazel:workspace_deps.bzl", "upb_deps")
38-
upb_deps()
39-
load("@build_bazel_rules_apple//apple:repositories.bzl", "apple_rules_dependencies")
40-
apple_rules_dependencies()
41-
load("@build_bazel_apple_support//lib:repositories.bzl", "apple_support_dependencies")
42-
apple_support_dependencies()
36+
load("@com_github_grpc_grpc//bazel:grpc_extra_deps.bzl", "grpc_extra_deps")
37+
38+
grpc_extra_deps()

‎bazel/google_cloud_cpp_common_deps.bzl‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,16 @@ def google_cloud_cpp_common_deps():
6060
build_file = "@com_github_googleapis_google_cloud_cpp_common//bazel:googleapis.BUILD",
6161
)
6262

63+
if "com_google_protobuf" not in native.existing_rules():
64+
http_archive(
65+
name = "com_google_protobuf",
66+
strip_prefix = "protobuf-3.11.3",
67+
urls = [
68+
"https://github.com/google/protobuf/archive/v3.11.3.tar.gz",
69+
],
70+
sha256 = "cf754718b0aa945b00550ed7962ddc167167bd922b842199eeb6505e6f344852",
71+
)
72+
6373
# Load gRPC and its dependencies, using a similar pattern to this function.
6474
# This implicitly loads "com_google_protobuf", which we use.
6575
if "com_github_grpc_grpc" not in native.existing_rules():

‎ci/kokoro/docker/Dockerfile.ubuntu-install‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ RUN pip install cmake_format==0.6.0
7676
# - When using CMake, only the version compiled with the same CMAKE_BUILD_TYPE
7777
# as the dependent (gRPC or google-cloud-cpp) works.
7878
WORKDIR /var/tmp/build
79-
RUN wget -q https://github.com/google/protobuf/archive/v3.9.1.tar.gz
80-
RUN tar -xf v3.9.1.tar.gz
81-
WORKDIR /var/tmp/build/protobuf-3.9.1/cmake
79+
RUN wget -q https://github.com/google/protobuf/archive/v3.11.3.tar.gz
80+
RUN tar -xf v3.11.3.tar.gz
81+
WORKDIR /var/tmp/build/protobuf-3.11.3/cmake
8282
RUN for build_type in "Debug" "Release"; do \
8383
cmake \
8484
-DCMAKE_BUILD_TYPE="${build_type}" \

‎ci/kokoro/install/Dockerfile.centos-7‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ ENV PATH=/usr/local/bin:${PATH}
5858

5959
# ```bash
6060
WORKDIR /var/tmp/build
61-
RUN wget -q https://github.com/google/protobuf/archive/v3.9.1.tar.gz && \
62-
tar -xf v3.9.1.tar.gz && \
63-
cd protobuf-3.9.1/cmake && \
61+
RUN wget -q https://github.com/google/protobuf/archive/v3.11.3.tar.gz && \
62+
tar -xf v3.11.3.tar.gz && \
63+
cd protobuf-3.11.3/cmake && \
6464
cmake \
6565
-DCMAKE_BUILD_TYPE=Release \
6666
-DBUILD_SHARED_LIBS=yes \

‎ci/kokoro/install/Dockerfile.centos-8‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ ENV PATH=/usr/local/bin:${PATH}
5252

5353
# ```bash
5454
WORKDIR /var/tmp/build
55-
RUN wget -q https://github.com/google/protobuf/archive/v3.9.1.tar.gz && \
56-
tar -xf v3.9.1.tar.gz && \
57-
cd protobuf-3.9.1/cmake && \
55+
RUN wget -q https://github.com/google/protobuf/archive/v3.11.3.tar.gz && \
56+
tar -xf v3.11.3.tar.gz && \
57+
cd protobuf-3.11.3/cmake && \
5858
cmake \
5959
-DCMAKE_BUILD_TYPE=Release \
6060
-DBUILD_SHARED_LIBS=yes \

‎ci/kokoro/install/Dockerfile.debian-stretch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ RUN apt update && \
4747

4848
# ```bash
4949
WORKDIR /var/tmp/build
50-
RUN wget -q https://github.com/google/protobuf/archive/v3.9.1.tar.gz && \
51-
tar -xf v3.9.1.tar.gz && \
52-
cd protobuf-3.9.1/cmake && \
50+
RUN wget -q https://github.com/google/protobuf/archive/v3.11.3.tar.gz && \
51+
tar -xf v3.11.3.tar.gz && \
52+
cd protobuf-3.11.3/cmake && \
5353
cmake \
5454
-DCMAKE_BUILD_TYPE=Release \
5555
-DBUILD_SHARED_LIBS=yes \

‎ci/kokoro/install/Dockerfile.opensuse-leap‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ ENV PATH=/usr/local/bin:${PATH}
5353

5454
# ```bash
5555
WORKDIR /var/tmp/build
56-
RUN wget -q https://github.com/google/protobuf/archive/v3.9.1.tar.gz && \
57-
tar -xf v3.9.1.tar.gz && \
58-
cd protobuf-3.9.1/cmake && \
56+
RUN wget -q https://github.com/google/protobuf/archive/v3.11.3.tar.gz && \
57+
tar -xf v3.11.3.tar.gz && \
58+
cd protobuf-3.11.3/cmake && \
5959
cmake \
6060
-DCMAKE_BUILD_TYPE=Release \
6161
-DBUILD_SHARED_LIBS=yes \

‎ci/kokoro/install/Dockerfile.ubuntu-bionic‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ RUN apt update && \
4040

4141
# ```bash
4242
WORKDIR /var/tmp/build
43-
RUN wget -q https://github.com/google/protobuf/archive/v3.9.1.tar.gz && \
44-
tar -xf v3.9.1.tar.gz && \
45-
cd protobuf-3.9.1/cmake && \
43+
RUN wget -q https://github.com/google/protobuf/archive/v3.11.3.tar.gz && \
44+
tar -xf v3.11.3.tar.gz && \
45+
cd protobuf-3.11.3/cmake && \
4646
cmake \
4747
-DCMAKE_BUILD_TYPE=Release \
4848
-DBUILD_SHARED_LIBS=yes \

0 commit comments

Comments
 (0)