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

Commit cc1a476

Browse files
authored
chore: update googleapis and cpp-cmakefiles deps to match -cpp (#1469)
* chore: update cpp-cmakefiles to 0.8.0 * chore: update googleapis dep for bazel
1 parent ff91d3d commit cc1a476

15 files changed

+62
-62
lines changed

bazel/google_cloud_cpp_spanner_deps.bzl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@ def google_cloud_cpp_spanner_deps():
7676
http_archive(
7777
name = "com_google_googleapis",
7878
urls = [
79-
"https://github.com/googleapis/googleapis/archive/bf839ae632e0f263a729569e44be4b38b1c85f9c.tar.gz",
79+
"https://github.com/googleapis/googleapis/archive/fea22b1d9f27f86ef355c1d0dba00e0791a08a19.tar.gz",
8080
],
81-
strip_prefix = "googleapis-bf839ae632e0f263a729569e44be4b38b1c85f9c",
82-
sha256 = "874a4ad1f65c346a8a73c91e78cca0d49e5da3be5a7e58a05d6b2c74bc331ac6",
81+
strip_prefix = "googleapis-fea22b1d9f27f86ef355c1d0dba00e0791a08a19",
82+
sha256 = "957ef432cdedbace1621bb023e6d8637ecbaa78856b3fc6e299f9b277ae990ff",
8383
build_file = "@com_github_googleapis_google_cloud_cpp_spanner//bazel:googleapis.BUILD",
8484
)
8585

ci/kokoro/Dockerfile.fedora-install

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ RUN cmake --build cmake-out/benchmark --target install -- -j $(nproc)
6363

6464
# Download and compile googleapis/cpp-cmakefiles:
6565
WORKDIR /var/tmp/build
66-
RUN wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.6.0.tar.gz
67-
RUN tar -xf v0.6.0.tar.gz
68-
WORKDIR /var/tmp/build/cpp-cmakefiles-0.6.0
66+
RUN wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.8.0.tar.gz
67+
RUN tar -xf v0.8.0.tar.gz
68+
WORKDIR /var/tmp/build/cpp-cmakefiles-0.8.0
6969
# Compile without the tests because we are testing spanner, not the base
7070
# libraries
7171
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
@@ -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.6.0.tar.gz && \
111-
tar -xf v0.6.0.tar.gz && \
112-
cd cpp-cmakefiles-0.6.0 && \
110+
RUN wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.8.0.tar.gz && \
111+
tar -xf v0.8.0.tar.gz && \
112+
cd cpp-cmakefiles-0.8.0 && \
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.6.0.tar.gz && \
90-
tar -xf v0.6.0.tar.gz && \
91-
cd cpp-cmakefiles-0.6.0 && \
89+
RUN wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.8.0.tar.gz && \
90+
tar -xf v0.8.0.tar.gz && \
91+
cd cpp-cmakefiles-0.8.0 && \
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
@@ -49,9 +49,9 @@ RUN apt-get update && \
4949

5050
# ```bash
5151
WORKDIR /var/tmp/build
52-
RUN wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.6.0.tar.gz && \
53-
tar -xf v0.6.0.tar.gz && \
54-
cd cpp-cmakefiles-0.6.0 && \
52+
RUN wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.8.0.tar.gz && \
53+
tar -xf v0.8.0.tar.gz && \
54+
cd cpp-cmakefiles-0.8.0 && \
5555
cmake -DBUILD_SHARED_LIBS=YES -H. -Bcmake-out && \
5656
cmake --build cmake-out -- -j ${NCPU:-4} && \
5757
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
@@ -82,9 +82,9 @@ RUN wget -q https://github.com/grpc/grpc/archive/78ace4cd5dfcc1f2eced44d22d752f1
8282

8383
# ```bash
8484
WORKDIR /var/tmp/build
85-
RUN wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.6.0.tar.gz && \
86-
tar -xf v0.6.0.tar.gz && \
87-
cd cpp-cmakefiles-0.6.0 && \
85+
RUN wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.8.0.tar.gz && \
86+
tar -xf v0.8.0.tar.gz && \
87+
cd cpp-cmakefiles-0.8.0 && \
8888
cmake -DBUILD_SHARED_LIBS=YES -H. -Bcmake-out && \
8989
cmake --build cmake-out -- -j ${NCPU:-4} && \
9090
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.6.0.tar.gz && \
59-
tar -xf v0.6.0.tar.gz && \
60-
cd cpp-cmakefiles-0.6.0 && \
58+
RUN wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.8.0.tar.gz && \
59+
tar -xf v0.8.0.tar.gz && \
60+
cd cpp-cmakefiles-0.8.0 && \
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} && \

ci/kokoro/install/Dockerfile.opensuse-leap

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

103103
# ```bash
104104
WORKDIR /var/tmp/build
105-
RUN wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.6.0.tar.gz && \
106-
tar -xf v0.6.0.tar.gz && \
107-
cd cpp-cmakefiles-0.6.0 && \
105+
RUN wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.8.0.tar.gz && \
106+
tar -xf v0.8.0.tar.gz && \
107+
cd cpp-cmakefiles-0.8.0 && \
108108
cmake -DBUILD_SHARED_LIBS=YES -H. -Bcmake-out && \
109109
cmake --build cmake-out -- -j ${NCPU:-4} && \
110110
cmake --build cmake-out --target install -- -j ${NCPU:-4} && \

ci/kokoro/install/Dockerfile.opensuse-tumbleweed

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

5454
# ```bash
5555
WORKDIR /var/tmp/build
56-
RUN wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.6.0.tar.gz && \
57-
tar -xf v0.6.0.tar.gz && \
58-
cd cpp-cmakefiles-0.6.0 && \
56+
RUN wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.8.0.tar.gz && \
57+
tar -xf v0.8.0.tar.gz && \
58+
cd cpp-cmakefiles-0.8.0 && \
5959
cmake -DBUILD_SHARED_LIBS=YES -H. -Bcmake-out && \
6060
cmake --build cmake-out -- -j ${NCPU:-4} && \
6161
cmake --build cmake-out --target install -- -j ${NCPU:-4} && \

ci/kokoro/install/Dockerfile.ubuntu-bionic

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

7676
# ```bash
7777
WORKDIR /var/tmp/build
78-
RUN wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.6.0.tar.gz && \
79-
tar -xf v0.6.0.tar.gz && \
80-
cd cpp-cmakefiles-0.6.0 && \
78+
RUN wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.8.0.tar.gz && \
79+
tar -xf v0.8.0.tar.gz && \
80+
cd cpp-cmakefiles-0.8.0 && \
8181
cmake -DBUILD_SHARED_LIBS=YES -H. -Bcmake-out && \
8282
cmake --build cmake-out -- -j ${NCPU:-4} && \
8383
cmake --build cmake-out --target install -- -j ${NCPU:-4} && \

0 commit comments

Comments
 (0)