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

Commit f4427ce

Browse files
devbwwdevbww
authored
chore: upgrade to cpp-cmakefiles v0.4.1 (#164)
Also upgrade to googleapis-a8ee1416f4c588f2ab92da72e7c1f588c784d3e6 to match cpp-cmakefiles v0.4.1.
1 parent b24ab4b commit f4427ce

18 files changed

+70
-70
lines changed

‎INSTALL.md‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,9 @@ We need a recent version of the Google Cloud Platform proto C++ libraries:
168168

169169
```bash
170170
cd $HOME/Downloads
171-
wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.1.5.tar.gz && \
172-
tar -xf v0.1.5.tar.gz && \
173-
cd cpp-cmakefiles-0.1.5 && \
171+
wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.4.1.tar.gz && \
172+
tar -xf v0.4.1.tar.gz && \
173+
cd cpp-cmakefiles-0.4.1 && \
174174
cmake -DBUILD_SHARED_LIBS=YES -H. -Bcmake-out && \
175175
cmake --build cmake-out -- -j ${NCPU:-4} && \
176176
sudo cmake --build cmake-out --target install -- -j ${NCPU:-4} && \
@@ -238,9 +238,9 @@ We need a recent version of the Google Cloud Platform proto C++ libraries:
238238

239239
```bash
240240
cd $HOME/Downloads
241-
wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.1.5.tar.gz && \
242-
tar -xf v0.1.5.tar.gz && \
243-
cd cpp-cmakefiles-0.1.5 && \
241+
wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.4.1.tar.gz && \
242+
tar -xf v0.4.1.tar.gz && \
243+
cd cpp-cmakefiles-0.4.1 && \
244244
cmake -DBUILD_SHARED_LIBS=YES -H. -Bcmake-out && \
245245
cmake --build cmake-out -- -j ${NCPU:-4} && \
246246
sudo cmake --build cmake-out --target install -- -j ${NCPU:-4} && \
@@ -357,9 +357,9 @@ We need a recent version of the Google Cloud Platform proto C++ libraries:
357357

358358
```bash
359359
cd $HOME/Downloads
360-
wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.1.5.tar.gz && \
361-
tar -xf v0.1.5.tar.gz && \
362-
cd cpp-cmakefiles-0.1.5 && \
360+
wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.4.1.tar.gz && \
361+
tar -xf v0.4.1.tar.gz && \
362+
cd cpp-cmakefiles-0.4.1 && \
363363
cmake -DBUILD_SHARED_LIBS=YES -H. -Bcmake-out && \
364364
cmake --build cmake-out -- -j ${NCPU:-4} && \
365365
sudo cmake --build cmake-out --target install -- -j ${NCPU:-4} && \
@@ -448,9 +448,9 @@ We need a recent version of the Google Cloud Platform proto C++ libraries:
448448

449449
```bash
450450
cd $HOME/Downloads
451-
wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.1.5.tar.gz && \
452-
tar -xf v0.1.5.tar.gz && \
453-
cd cpp-cmakefiles-0.1.5 && \
451+
wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.4.1.tar.gz && \
452+
tar -xf v0.4.1.tar.gz && \
453+
cd cpp-cmakefiles-0.4.1 && \
454454
cmake -DBUILD_SHARED_LIBS=YES -H. -Bcmake-out && \
455455
cmake --build cmake-out -- -j ${NCPU:-4} && \
456456
sudo cmake --build cmake-out --target install -- -j ${NCPU:-4} && \
@@ -554,9 +554,9 @@ We need a recent version of the Google Cloud Platform proto C++ libraries:
554554

555555
```bash
556556
cd $HOME/Downloads
557-
wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.1.5.tar.gz && \
558-
tar -xf v0.1.5.tar.gz && \
559-
cd cpp-cmakefiles-0.1.5 && \
557+
wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.4.1.tar.gz && \
558+
tar -xf v0.4.1.tar.gz && \
559+
cd cpp-cmakefiles-0.4.1 && \
560560
cmake -DBUILD_SHARED_LIBS=YES -H. -Bcmake-out && \
561561
cmake --build cmake-out -- -j ${NCPU:-4} && \
562562
sudo cmake --build cmake-out --target install -- -j ${NCPU:-4} && \
@@ -618,9 +618,9 @@ We need a recent version of the Google Cloud Platform proto C++ libraries:
618618

619619
```bash
620620
cd $HOME/Downloads
621-
wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.1.5.tar.gz && \
622-
tar -xf v0.1.5.tar.gz && \
623-
cd cpp-cmakefiles-0.1.5 && \
621+
wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.4.1.tar.gz && \
622+
tar -xf v0.4.1.tar.gz && \
623+
cd cpp-cmakefiles-0.4.1 && \
624624
cmake -DBUILD_SHARED_LIBS=YES -H. -Bcmake-out && \
625625
cmake --build cmake-out -- -j ${NCPU:-4} && \
626626
sudo cmake --build cmake-out --target install -- -j ${NCPU:-4} && \
@@ -716,9 +716,9 @@ We need a recent version of the Google Cloud Platform proto C++ libraries:
716716

717717
```bash
718718
cd $HOME/Downloads
719-
wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.1.5.tar.gz && \
720-
tar -xf v0.1.5.tar.gz && \
721-
cd cpp-cmakefiles-0.1.5 && \
719+
wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.4.1.tar.gz && \
720+
tar -xf v0.4.1.tar.gz && \
721+
cd cpp-cmakefiles-0.4.1 && \
722722
cmake -DBUILD_SHARED_LIBS=YES -H. -Bcmake-out && \
723723
cmake --build cmake-out -- -j ${NCPU:-4} && \
724724
sudo cmake --build cmake-out --target install -- -j ${NCPU:-4} && \
@@ -819,9 +819,9 @@ We need a recent version of the Google Cloud Platform proto C++ libraries:
819819

820820
```bash
821821
cd $HOME/Downloads
822-
wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.1.5.tar.gz && \
823-
tar -xf v0.1.5.tar.gz && \
824-
cd cpp-cmakefiles-0.1.5 && \
822+
wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.4.1.tar.gz && \
823+
tar -xf v0.4.1.tar.gz && \
824+
cd cpp-cmakefiles-0.4.1 && \
825825
cmake -DBUILD_SHARED_LIBS=YES -H. -Bcmake-out && \
826826
cmake --build cmake-out -- -j ${NCPU:-4} && \
827827
sudo cmake --build cmake-out --target install -- -j ${NCPU:-4} && \
@@ -943,9 +943,9 @@ We need a recent version of the Google Cloud Platform proto C++ libraries:
943943

944944
```bash
945945
cd $HOME/Downloads
946-
wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.1.5.tar.gz && \
947-
tar -xf v0.1.5.tar.gz && \
948-
cd cpp-cmakefiles-0.1.5 && \
946+
wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.4.1.tar.gz && \
947+
tar -xf v0.4.1.tar.gz && \
948+
cd cpp-cmakefiles-0.4.1 && \
949949
cmake -DBUILD_SHARED_LIBS=YES -H. -Bcmake-out && \
950950
cmake --build cmake-out -- -j ${NCPU:-4} && \
951951
sudo cmake --build cmake-out --target install -- -j ${NCPU:-4} && \

‎bazel/google_cloud_cpp_common_deps.bzl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ def google_cloud_cpp_common_deps():
5353
http_archive(
5454
name = "com_google_googleapis",
5555
urls = [
56-
"https://github.com/googleapis/googleapis/archive/a8ee1416f4c588f2ab92da72e7c1f588c784d3e6.tar.gz",
56+
"https://github.com/googleapis/googleapis/archive/19c4589a3cb44b3679f7b3fba88365b3d055d5f8.tar.gz",
5757
],
58-
strip_prefix = "googleapis-a8ee1416f4c588f2ab92da72e7c1f588c784d3e6",
59-
sha256 = "6b8a9b2bcb4476e9a5a9872869996f0d639c8d5df76dd8a893e79201f211b1cf",
58+
strip_prefix = "googleapis-19c4589a3cb44b3679f7b3fba88365b3d055d5f8",
59+
sha256 = "ef455e46cfb967962aef30248f1a2a69bc78b041e89b04644e24e7844f0215c4",
6060
build_file = "@com_github_googleapis_google_cloud_cpp_common//bazel:googleapis.BUILD",
6161
)
6262

‎bazel/googleapis.BUILD‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ cc_library(
3030

3131
cc_proto_library(
3232
name = "bigtableadmin_cc_proto",
33-
deps = ["//google/bigtable/admin/v2:bigtableadmin_proto"],
33+
deps = ["//google/bigtable/admin/v2:admin_proto"],
3434
)
3535

3636
cc_proto_library(
@@ -41,7 +41,7 @@ cc_proto_library(
4141
cc_grpc_library(
4242
name = "bigtableadmin_cc_grpc",
4343
srcs = [
44-
"//google/bigtable/admin/v2:bigtableadmin_proto",
44+
"//google/bigtable/admin/v2:admin_proto",
4545
],
4646
grpc_only = True,
4747
use_external = True,

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ RUN dnf makecache && dnf install -y \
4848

4949
# Install googleapis.
5050
WORKDIR /var/tmp/build
51-
RUN wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.1.5.tar.gz
52-
RUN tar -xf v0.1.5.tar.gz
53-
WORKDIR /var/tmp/build/cpp-cmakefiles-0.1.5
51+
RUN wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.4.1.tar.gz
52+
RUN tar -xf v0.4.1.tar.gz
53+
WORKDIR /var/tmp/build/cpp-cmakefiles-0.4.1
5454
RUN cmake \
5555
-DBUILD_SHARED_LIBS=YES \
5656
-H. -Bcmake-out

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

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

130130
# Install googleapis.
131131
WORKDIR /var/tmp/build
132-
RUN wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.1.5.tar.gz
133-
RUN tar -xf v0.1.5.tar.gz
134-
WORKDIR /var/tmp/build/cpp-cmakefiles-0.1.5
132+
RUN wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.4.1.tar.gz
133+
RUN tar -xf v0.4.1.tar.gz
134+
WORKDIR /var/tmp/build/cpp-cmakefiles-0.4.1
135135
RUN cmake \
136136
-DBUILD_SHARED_LIBS=YES \
137137
-H. -Bcmake-out

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,9 @@ RUN wget -q https://github.com/grpc/grpc/archive/78ace4cd5dfcc1f2eced44d22d752f1
107107

108108
# ```bash
109109
WORKDIR /var/tmp/build
110-
RUN wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.1.5.tar.gz && \
111-
tar -xf v0.1.5.tar.gz && \
112-
cd cpp-cmakefiles-0.1.5 && \
110+
RUN wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.4.1.tar.gz && \
111+
tar -xf v0.4.1.tar.gz && \
112+
cd cpp-cmakefiles-0.4.1 && \
113113
cmake -DBUILD_SHARED_LIBS=YES -H. -Bcmake-out && \
114114
cmake --build cmake-out -- -j ${NCPU:-4} && \
115115
cmake --build cmake-out --target install -- -j ${NCPU:-4} && \

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@ RUN wget -q https://github.com/grpc/grpc/archive/78ace4cd5dfcc1f2eced44d22d752f1
8686

8787
# ```bash
8888
WORKDIR /var/tmp/build
89-
RUN wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.1.5.tar.gz && \
90-
tar -xf v0.1.5.tar.gz && \
91-
cd cpp-cmakefiles-0.1.5 && \
89+
RUN wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.4.1.tar.gz && \
90+
tar -xf v0.4.1.tar.gz && \
91+
cd cpp-cmakefiles-0.4.1 && \
9292
cmake -DBUILD_SHARED_LIBS=YES -H. -Bcmake-out && \
9393
cmake --build cmake-out -- -j ${NCPU:-4} && \
9494
cmake --build cmake-out --target install -- -j ${NCPU:-4} && \

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

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/googleapis/cpp-cmakefiles/archive/v0.1.5.tar.gz && \
51-
tar -xf v0.1.5.tar.gz && \
52-
cd cpp-cmakefiles-0.1.5 && \
50+
RUN wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.4.1.tar.gz && \
51+
tar -xf v0.4.1.tar.gz && \
52+
cd cpp-cmakefiles-0.4.1 && \
5353
cmake -DBUILD_SHARED_LIBS=YES -H. -Bcmake-out && \
5454
cmake --build cmake-out -- -j ${NCPU:-4} && \
5555
cmake --build cmake-out --target install -- -j ${NCPU:-4} && \

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@ RUN wget -q https://github.com/grpc/grpc/archive/78ace4cd5dfcc1f2eced44d22d752f1
8181

8282
# ```bash
8383
WORKDIR /var/tmp/build
84-
RUN wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.1.5.tar.gz && \
85-
tar -xf v0.1.5.tar.gz && \
86-
cd cpp-cmakefiles-0.1.5 && \
84+
RUN wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.4.1.tar.gz && \
85+
tar -xf v0.4.1.tar.gz && \
86+
cd cpp-cmakefiles-0.4.1 && \
8787
cmake -DBUILD_SHARED_LIBS=YES -H. -Bcmake-out && \
8888
cmake --build cmake-out -- -j ${NCPU:-4} && \
8989
cmake --build cmake-out --target install -- -j ${NCPU:-4} && \

‎ci/kokoro/install/Dockerfile.fedora‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ ENV PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig
5555

5656
# ```bash
5757
WORKDIR /var/tmp/build
58-
RUN wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.1.5.tar.gz && \
59-
tar -xf v0.1.5.tar.gz && \
60-
cd cpp-cmakefiles-0.1.5 && \
58+
RUN wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.4.1.tar.gz && \
59+
tar -xf v0.4.1.tar.gz && \
60+
cd cpp-cmakefiles-0.4.1 && \
6161
cmake -DBUILD_SHARED_LIBS=YES -H. -Bcmake-out && \
6262
cmake --build cmake-out -- -j ${NCPU:-4} && \
6363
cmake --build cmake-out --target install -- -j ${NCPU:-4} && \

0 commit comments

Comments
 (0)