Skip to content

Commit 8a2001f

Browse files
coryancoryan
authored
chore: upgrade g-c-cpp-common to v0.25.0 (#3633)
* chore: upgrade g-c-cpp-common to v0.25.0 * Remove reference to coryan's fork (used for debugging)
1 parent 8e85f8c commit 8a2001f

16 files changed

+69
-71
lines changed

‎INSTALL.md‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -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.24.0.tar.gz && \
251-
tar -xf v0.24.0.tar.gz && \
252-
cd google-cloud-cpp-common-0.24.0 && \
250+
wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.25.0.tar.gz && \
251+
tar -xf v0.25.0.tar.gz && \
252+
cd google-cloud-cpp-common-0.25.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.24.0.tar.gz && \
361-
tar -xf v0.24.0.tar.gz && \
362-
cd google-cloud-cpp-common-0.24.0 && \
360+
wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.25.0.tar.gz && \
361+
tar -xf v0.25.0.tar.gz && \
362+
cd google-cloud-cpp-common-0.25.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.24.0.tar.gz && \
520-
tar -xf v0.24.0.tar.gz && \
521-
cd google-cloud-cpp-common-0.24.0 && \
519+
wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.25.0.tar.gz && \
520+
tar -xf v0.25.0.tar.gz && \
521+
cd google-cloud-cpp-common-0.25.0 && \
522522
cmake -H. -Bcmake-out \
523523
-DBUILD_TESTING=OFF \
524524
-DGOOGLE_CLOUD_CPP_TESTING_UTIL_ENABLE_INSTALL=ON && \
@@ -648,9 +648,9 @@ all the Google Cloud C++ client libraries:
648648

649649
```bash
650650
cd $HOME/Downloads
651-
wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.24.0.tar.gz && \
652-
tar -xf v0.24.0.tar.gz && \
653-
cd google-cloud-cpp-common-0.24.0 && \
651+
wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.25.0.tar.gz && \
652+
tar -xf v0.25.0.tar.gz && \
653+
cd google-cloud-cpp-common-0.25.0 && \
654654
cmake -H. -Bcmake-out \
655655
-DBUILD_TESTING=OFF \
656656
-DGOOGLE_CLOUD_CPP_TESTING_UTIL_ENABLE_INSTALL=ON && \
@@ -795,9 +795,9 @@ all the Google Cloud C++ client libraries:
795795

796796
```bash
797797
cd $HOME/Downloads
798-
wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.24.0.tar.gz && \
799-
tar -xf v0.24.0.tar.gz && \
800-
cd google-cloud-cpp-common-0.24.0 && \
798+
wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.25.0.tar.gz && \
799+
tar -xf v0.25.0.tar.gz && \
800+
cd google-cloud-cpp-common-0.25.0 && \
801801
cmake -H. -Bcmake-out \
802802
-DBUILD_TESTING=OFF \
803803
-DGOOGLE_CLOUD_CPP_TESTING_UTIL_ENABLE_INSTALL=ON && \
@@ -934,9 +934,9 @@ all the Google Cloud C++ client libraries:
934934

935935
```bash
936936
cd $HOME/Downloads
937-
wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.24.0.tar.gz && \
938-
tar -xf v0.24.0.tar.gz && \
939-
cd google-cloud-cpp-common-0.24.0 && \
937+
wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.25.0.tar.gz && \
938+
tar -xf v0.25.0.tar.gz && \
939+
cd google-cloud-cpp-common-0.25.0 && \
940940
cmake -H. -Bcmake-out \
941941
-DBUILD_TESTING=OFF \
942942
-DGOOGLE_CLOUD_CPP_TESTING_UTIL_ENABLE_INSTALL=ON && \
@@ -1098,9 +1098,9 @@ all the Google Cloud C++ client libraries:
10981098

10991099
```bash
11001100
cd $HOME/Downloads
1101-
wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.24.0.tar.gz && \
1102-
tar -xf v0.24.0.tar.gz && \
1103-
cd google-cloud-cpp-common-0.24.0 && \
1101+
wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.25.0.tar.gz && \
1102+
tar -xf v0.25.0.tar.gz && \
1103+
cd google-cloud-cpp-common-0.25.0 && \
11041104
cmake -H. -Bcmake-out \
11051105
-DBUILD_TESTING=OFF \
11061106
-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.24.0",
44+
strip_prefix = "google-cloud-cpp-common-0.25.0",
4545
urls = [
46-
"https://github.com/googleapis/google-cloud-cpp-common/archive/v0.24.0.tar.gz",
46+
"https://github.com/googleapis/google-cloud-cpp-common/archive/v0.25.0.tar.gz",
4747
],
48-
sha256 = "d5e9075dd052e4ffdeba987d9e0c5b5583312e1213d79b913f811d4d2e78caee",
48+
sha256 = "9ef2bb9b731cade7eb1be7e45323becb78cecda7e39b0a4050d7b787425d5efb",
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
@@ -91,9 +91,9 @@ RUN wget -q https://github.com/google/crc32c/archive/1.1.0.tar.gz && \
9191

9292
# Download and compile google-cloud-cpp-common from source too.
9393
WORKDIR /var/tmp/build
94-
RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.24.0.tar.gz && \
95-
tar -xf v0.24.0.tar.gz && \
96-
cd /var/tmp/build/google-cloud-cpp-common-0.24.0 && \
94+
RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.25.0.tar.gz && \
95+
tar -xf v0.25.0.tar.gz && \
96+
cd /var/tmp/build/google-cloud-cpp-common-0.25.0 && \
9797
cmake -H. -Bcmake-out \
9898
-DBUILD_SHARED_LIBS=YES \
9999
-DBUILD_TESTING=OFF \

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

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -156,18 +156,16 @@ RUN ldconfig
156156

157157
# Download and compile google-cloud-cpp from source too:
158158
WORKDIR /var/tmp/build
159-
RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.24.0.tar.gz
160-
RUN tar -xf v0.24.0.tar.gz
161-
WORKDIR /var/tmp/build/google-cloud-cpp-common-0.24.0
162-
# Compile without the tests because we are testing google-cloud-cpp, not the
163-
# base libraries
164-
RUN cmake -H. -Bcmake-out \
165-
-DBUILD_TESTING=OFF \
166-
-DBUILD_SHARED_LIBS=yes \
167-
-DGOOGLE_CLOUD_CPP_TESTING_UTIL_ENABLE_INSTALL=ON
168-
RUN cmake --build cmake-out -- -j $(nproc)
169-
RUN cmake --build cmake-out --target install
170-
RUN ldconfig
159+
RUN wget -q https://github.com/coryan/google-cloud-cpp-common/archive/v0.25.0.tar.gz && \
160+
tar -xf v0.25.0.tar.gz && \
161+
cd /var/tmp/build/google-cloud-cpp-common-0.25.0 && \
162+
cmake -H. -Bcmake-out \
163+
-DBUILD_SHARED_LIBS=YES \
164+
-DBUILD_TESTING=OFF \
165+
-DGOOGLE_CLOUD_CPP_TESTING_UTIL_ENABLE_INSTALL=ON && \
166+
cmake --build cmake-out --target install -- -j ${NCPU} && \
167+
ldconfig && \
168+
cd /var/tmp && rm -fr build
171169

172170
RUN find /usr/local -type d | xargs chmod 777
173171

‎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.24.0.tar.gz && \
165-
tar -xf v0.24.0.tar.gz && \
166-
cd google-cloud-cpp-common-0.24.0 && \
164+
RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.25.0.tar.gz && \
165+
tar -xf v0.25.0.tar.gz && \
166+
cd google-cloud-cpp-common-0.25.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.24.0.tar.gz && \
144-
tar -xf v0.24.0.tar.gz && \
145-
cd google-cloud-cpp-common-0.24.0 && \
143+
RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.25.0.tar.gz && \
144+
tar -xf v0.25.0.tar.gz && \
145+
cd google-cloud-cpp-common-0.25.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
@@ -103,9 +103,9 @@ RUN wget -q https://github.com/google/googletest/archive/release-1.10.0.tar.gz &
103103

104104
# ```bash
105105
WORKDIR /var/tmp/build
106-
RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.24.0.tar.gz && \
107-
tar -xf v0.24.0.tar.gz && \
108-
cd google-cloud-cpp-common-0.24.0 && \
106+
RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.25.0.tar.gz && \
107+
tar -xf v0.25.0.tar.gz && \
108+
cd google-cloud-cpp-common-0.25.0 && \
109109
cmake -H. -Bcmake-out \
110110
-DBUILD_TESTING=OFF \
111111
-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
@@ -136,9 +136,9 @@ RUN wget -q https://github.com/google/googletest/archive/release-1.10.0.tar.gz &
136136

137137
# ```bash
138138
WORKDIR /var/tmp/build
139-
RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.24.0.tar.gz && \
140-
tar -xf v0.24.0.tar.gz && \
141-
cd google-cloud-cpp-common-0.24.0 && \
139+
RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.25.0.tar.gz && \
140+
tar -xf v0.25.0.tar.gz && \
141+
cd google-cloud-cpp-common-0.25.0 && \
142142
cmake -H. -Bcmake-out \
143143
-DBUILD_TESTING=OFF \
144144
-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.24.0.tar.gz && \
113-
tar -xf v0.24.0.tar.gz && \
114-
cd google-cloud-cpp-common-0.24.0 && \
112+
RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.25.0.tar.gz && \
113+
tar -xf v0.25.0.tar.gz && \
114+
cd google-cloud-cpp-common-0.25.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.24.0.tar.gz && \
160-
tar -xf v0.24.0.tar.gz && \
161-
cd google-cloud-cpp-common-0.24.0 && \
159+
RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.25.0.tar.gz && \
160+
tar -xf v0.25.0.tar.gz && \
161+
cd google-cloud-cpp-common-0.25.0 && \
162162
cmake -H. -Bcmake-out \
163163
-DBUILD_TESTING=OFF \
164164
-DGOOGLE_CLOUD_CPP_TESTING_UTIL_ENABLE_INSTALL=ON && \

0 commit comments

Comments
 (0)