Skip to content

Commit 57b738e

Browse files
coryancoryan
authored
chore: update g-c-cpp-common to v0.19.0 (#3384)
Upgrade to the latest version of `google-cloud-cpp-common`. This version removed a number of symbols from `google::cloud::grpc_utils::internal`, and we unfortunately used those. Better to bite the bullet and use the new symbols everywhere, as opposed to the backwards compatibility aliases. In addition, the behavior of a test class (`EnvironmentVariableRestore`) changed for the better, and some tests needed fixing. Updated the API baseline because of the symbol name changes. Fixed the Windows+CMake build scripts to correctly update vcpkg dependencies.
1 parent f68afb1 commit 57b738e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+180
-188
lines changed

‎INSTALL.md‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Installing google-cloud-cpp
22

3-
<!-- Automaticatically generated by ci/test-readme -->
3+
<!-- Automaticatically generated by ./ci/test-readme -->
44

55
By default google-cloud-cpp libraries download and compile all their
66
dependencies ([see below](#required-libraries) for a complete list). This makes
@@ -247,9 +247,9 @@ all the Google Cloud C++ client libraries:
247247

248248
```bash
249249
cd $HOME/Downloads
250-
wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.18.0.tar.gz && \
251-
tar -xf v0.18.0.tar.gz && \
252-
cd google-cloud-cpp-common-0.18.0 && \
250+
wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.19.0.tar.gz && \
251+
tar -xf v0.19.0.tar.gz && \
252+
cd google-cloud-cpp-common-0.19.0 && \
253253
cmake -H. -Bcmake-out \
254254
-DBUILD_TESTING=OFF \
255255
-DGOOGLE_CLOUD_CPP_TESTING_UTIL_ENABLE_INSTALL=ON && \
@@ -357,9 +357,9 @@ all the Google Cloud C++ client libraries:
357357

358358
```bash
359359
cd $HOME/Downloads
360-
wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.18.0.tar.gz && \
361-
tar -xf v0.18.0.tar.gz && \
362-
cd google-cloud-cpp-common-0.18.0 && \
360+
wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.19.0.tar.gz && \
361+
tar -xf v0.19.0.tar.gz && \
362+
cd google-cloud-cpp-common-0.19.0 && \
363363
cmake -H. -Bcmake-out \
364364
-DBUILD_TESTING=OFF \
365365
-DGOOGLE_CLOUD_CPP_TESTING_UTIL_ENABLE_INSTALL=ON && \
@@ -516,9 +516,9 @@ all the Google Cloud C++ client libraries:
516516

517517
```bash
518518
cd $HOME/Downloads
519-
wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.18.0.tar.gz && \
520-
tar -xf v0.18.0.tar.gz && \
521-
cd google-cloud-cpp-common-0.18.0 && \
519+
wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.19.0.tar.gz && \
520+
tar -xf v0.19.0.tar.gz && \
521+
cd google-cloud-cpp-common-0.19.0 && \
522522
cmake -H. -Bcmake-out \
523523
-DBUILD_TESTING=OFF \
524524
-DGOOGLE_CLOUD_CPP_TESTING_UTIL_ENABLE_INSTALL=ON && \
@@ -647,9 +647,9 @@ all the Google Cloud C++ client libraries:
647647

648648
```bash
649649
cd $HOME/Downloads
650-
wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.18.0.tar.gz && \
651-
tar -xf v0.18.0.tar.gz && \
652-
cd google-cloud-cpp-common-0.18.0 && \
650+
wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.19.0.tar.gz && \
651+
tar -xf v0.19.0.tar.gz && \
652+
cd google-cloud-cpp-common-0.19.0 && \
653653
cmake -H. -Bcmake-out \
654654
-DBUILD_TESTING=OFF \
655655
-DGOOGLE_CLOUD_CPP_TESTING_UTIL_ENABLE_INSTALL=ON && \
@@ -793,9 +793,9 @@ all the Google Cloud C++ client libraries:
793793

794794
```bash
795795
cd $HOME/Downloads
796-
wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.18.0.tar.gz && \
797-
tar -xf v0.18.0.tar.gz && \
798-
cd google-cloud-cpp-common-0.18.0 && \
796+
wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.19.0.tar.gz && \
797+
tar -xf v0.19.0.tar.gz && \
798+
cd google-cloud-cpp-common-0.19.0 && \
799799
cmake -H. -Bcmake-out \
800800
-DBUILD_TESTING=OFF \
801801
-DGOOGLE_CLOUD_CPP_TESTING_UTIL_ENABLE_INSTALL=ON && \
@@ -931,9 +931,9 @@ all the Google Cloud C++ client libraries:
931931

932932
```bash
933933
cd $HOME/Downloads
934-
wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.18.0.tar.gz && \
935-
tar -xf v0.18.0.tar.gz && \
936-
cd google-cloud-cpp-common-0.18.0 && \
934+
wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.19.0.tar.gz && \
935+
tar -xf v0.19.0.tar.gz && \
936+
cd google-cloud-cpp-common-0.19.0 && \
937937
cmake -H. -Bcmake-out \
938938
-DBUILD_TESTING=OFF \
939939
-DGOOGLE_CLOUD_CPP_TESTING_UTIL_ENABLE_INSTALL=ON && \
@@ -1095,9 +1095,9 @@ all the Google Cloud C++ client libraries:
10951095

10961096
```bash
10971097
cd $HOME/Downloads
1098-
wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.18.0.tar.gz && \
1099-
tar -xf v0.18.0.tar.gz && \
1100-
cd google-cloud-cpp-common-0.18.0 && \
1098+
wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.19.0.tar.gz && \
1099+
tar -xf v0.19.0.tar.gz && \
1100+
cd google-cloud-cpp-common-0.19.0 && \
11011101
cmake -H. -Bcmake-out \
11021102
-DBUILD_TESTING=OFF \
11031103
-DGOOGLE_CLOUD_CPP_TESTING_UTIL_ENABLE_INSTALL=ON && \

‎bazel/google_cloud_cpp_deps.bzl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ def google_cloud_cpp_deps():
4141
if "com_github_googleapis_google_cloud_cpp_common" not in native.existing_rules():
4242
http_archive(
4343
name = "com_github_googleapis_google_cloud_cpp_common",
44-
strip_prefix = "google-cloud-cpp-common-0.18.0",
44+
strip_prefix = "google-cloud-cpp-common-0.19.0",
4545
urls = [
46-
"https://github.com/googleapis/google-cloud-cpp-common/archive/v0.18.0.tar.gz",
46+
"https://github.com/googleapis/google-cloud-cpp-common/archive/v0.19.0.tar.gz",
4747
],
48-
sha256 = "af61c97919da43b7df0e917d27c3be6d0b8de96306140d552ac41ae579353b6a",
48+
sha256 = "40dc0d1465a04939bada7bab280d24ee9fe33b3370e2ab4422bb51c1ed4977c8",
4949
)
5050

5151
# Load a version of googletest that we know works.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,9 @@ RUN ldconfig
9090

9191
# Download and compile google-cloud-cpp from source too:
9292
WORKDIR /var/tmp/build
93-
RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.18.0.tar.gz
94-
RUN tar -xf v0.18.0.tar.gz
95-
WORKDIR /var/tmp/build/google-cloud-cpp-common-0.18.0
93+
RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.19.0.tar.gz
94+
RUN tar -xf v0.19.0.tar.gz
95+
WORKDIR /var/tmp/build/google-cloud-cpp-common-0.19.0
9696
# Compile without the tests because we are testing google-cloud-cpp, not the
9797
# base libraries
9898
RUN cmake -H. -Bcmake-out \

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,9 +172,9 @@ RUN ldconfig
172172

173173
# Download and compile google-cloud-cpp from source too:
174174
WORKDIR /var/tmp/build
175-
RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.18.0.tar.gz
176-
RUN tar -xf v0.18.0.tar.gz
177-
WORKDIR /var/tmp/build/google-cloud-cpp-common-0.18.0
175+
RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.19.0.tar.gz
176+
RUN tar -xf v0.19.0.tar.gz
177+
WORKDIR /var/tmp/build/google-cloud-cpp-common-0.19.0
178178
# Compile without the tests because we are testing google-cloud-cpp, not the
179179
# base libraries
180180
RUN cmake -H. -Bcmake-out \

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,9 +161,9 @@ RUN wget -q https://github.com/google/googletest/archive/release-1.10.0.tar.gz &
161161

162162
# ```bash
163163
WORKDIR /var/tmp/build
164-
RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.18.0.tar.gz && \
165-
tar -xf v0.18.0.tar.gz && \
166-
cd google-cloud-cpp-common-0.18.0 && \
164+
RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.19.0.tar.gz && \
165+
tar -xf v0.19.0.tar.gz && \
166+
cd google-cloud-cpp-common-0.19.0 && \
167167
cmake -H. -Bcmake-out \
168168
-DBUILD_TESTING=OFF \
169169
-DGOOGLE_CLOUD_CPP_TESTING_UTIL_ENABLE_INSTALL=ON && \

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,9 @@ RUN wget -q https://github.com/google/googletest/archive/release-1.10.0.tar.gz &
140140

141141
# ```bash
142142
WORKDIR /var/tmp/build
143-
RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.18.0.tar.gz && \
144-
tar -xf v0.18.0.tar.gz && \
145-
cd google-cloud-cpp-common-0.18.0 && \
143+
RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.19.0.tar.gz && \
144+
tar -xf v0.19.0.tar.gz && \
145+
cd google-cloud-cpp-common-0.19.0 && \
146146
cmake -H. -Bcmake-out \
147147
-DBUILD_TESTING=OFF \
148148
-DGOOGLE_CLOUD_CPP_TESTING_UTIL_ENABLE_INSTALL=ON && \

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,9 @@ RUN wget -q https://github.com/google/googletest/archive/release-1.10.0.tar.gz &
101101

102102
# ```bash
103103
WORKDIR /var/tmp/build
104-
RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.18.0.tar.gz && \
105-
tar -xf v0.18.0.tar.gz && \
106-
cd google-cloud-cpp-common-0.18.0 && \
104+
RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.19.0.tar.gz && \
105+
tar -xf v0.19.0.tar.gz && \
106+
cd google-cloud-cpp-common-0.19.0 && \
107107
cmake -H. -Bcmake-out \
108108
-DBUILD_TESTING=OFF \
109109
-DGOOGLE_CLOUD_CPP_TESTING_UTIL_ENABLE_INSTALL=ON && \

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,9 @@ RUN wget -q https://github.com/google/googletest/archive/release-1.10.0.tar.gz &
135135

136136
# ```bash
137137
WORKDIR /var/tmp/build
138-
RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.18.0.tar.gz && \
139-
tar -xf v0.18.0.tar.gz && \
140-
cd google-cloud-cpp-common-0.18.0 && \
138+
RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.19.0.tar.gz && \
139+
tar -xf v0.19.0.tar.gz && \
140+
cd google-cloud-cpp-common-0.19.0 && \
141141
cmake -H. -Bcmake-out \
142142
-DBUILD_TESTING=OFF \
143143
-DGOOGLE_CLOUD_CPP_TESTING_UTIL_ENABLE_INSTALL=ON && \

‎ci/kokoro/install/Dockerfile.fedora‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@ RUN wget -q https://github.com/google/googletest/archive/release-1.10.0.tar.gz &
109109

110110
# ```bash
111111
WORKDIR /var/tmp/build
112-
RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.18.0.tar.gz && \
113-
tar -xf v0.18.0.tar.gz && \
114-
cd google-cloud-cpp-common-0.18.0 && \
112+
RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.19.0.tar.gz && \
113+
tar -xf v0.19.0.tar.gz && \
114+
cd google-cloud-cpp-common-0.19.0 && \
115115
cmake -H. -Bcmake-out \
116116
-DBUILD_TESTING=OFF \
117117
-DGOOGLE_CLOUD_CPP_TESTING_UTIL_ENABLE_INSTALL=ON && \

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,9 +156,9 @@ RUN wget -q https://github.com/google/googletest/archive/release-1.10.0.tar.gz &
156156

157157
# ```bash
158158
WORKDIR /var/tmp/build
159-
RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.18.0.tar.gz && \
160-
tar -xf v0.18.0.tar.gz && \
161-
cd google-cloud-cpp-common-0.18.0 && \
159+
RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.19.0.tar.gz && \
160+
tar -xf v0.19.0.tar.gz && \
161+
cd google-cloud-cpp-common-0.19.0 && \
162162
cmake -H. -Bcmake-out \
163163
-DBUILD_TESTING=OFF \
164164
-DGOOGLE_CLOUD_CPP_TESTING_UTIL_ENABLE_INSTALL=ON && \

0 commit comments

Comments
 (0)