Skip to content

Commit 7077419

Browse files
scotthartscotthart
authored
ci(v3): update cmake deps (#15953)
1 parent fba4b34 commit 7077419

File tree

170 files changed

+217
-180
lines changed

Some content is hidden

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

170 files changed

+217
-180
lines changed

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# limitations under the License.
1515
# ~~~
1616

17-
cmake_minimum_required(VERSION 3.16...3.31)
17+
cmake_minimum_required(VERSION 3.22...3.31)
1818

1919
# Define the project name and where to report bugs.
2020
set(PACKAGE_BUGREPORT "https://github.com/googleapis/google-cloud-cpp/issues")

‎ci/cloudbuild/dockerfiles/demo-alpine-stable.Dockerfile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,8 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24
8888

8989
## [DONE packaging.md]
9090

91+
RUN apk update && apk add gdb
92+
9193
# Speed up the CI builds using sccache.
9294
WORKDIR /var/tmp/sccache
9395
RUN curl -fsSL https://github.com/mozilla/sccache/releases/download/v0.10.0/sccache-v0.10.0-x86_64-unknown-linux-musl.tar.gz | \

‎ci/cloudbuild/dockerfiles/demo-debian-bookworm.Dockerfile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,9 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24
9999

100100
## [DONE packaging.md]
101101

102+
RUN apt-get update && \
103+
apt-get --no-install-recommends install -y gdb
104+
102105
WORKDIR /var/tmp/sccache
103106
RUN curl -fsSL https://github.com/mozilla/sccache/releases/download/v0.10.0/sccache-v0.10.0-x86_64-unknown-linux-musl.tar.gz | \
104107
tar -zxf - --strip-components=1 && \

‎ci/cloudbuild/dockerfiles/demo-debian-bullseye.Dockerfile‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,17 @@ ARG NCPU=4
2222
# ```bash
2323
RUN apt-get update && \
2424
apt-get --no-install-recommends install -y apt-transport-https apt-utils \
25-
automake build-essential ca-certificates cmake curl git \
25+
automake build-essential ca-certificates curl git \
2626
gcc g++ libc-ares-dev libc-ares2 libcurl4-openssl-dev \
2727
libssl-dev m4 make ninja-build pkg-config tar wget zlib1g-dev
2828
# ```
2929

30+
# #### Install CMake v3.22
31+
WORKDIR /var/tmp/build/cmake
32+
RUN curl -fsSL https://github.com/Kitware/cmake/archive/v3.22.3.tar.gz | \
33+
tar -xzf - --strip-components=1 && \
34+
./bootstrap && make -j ${NCPU:-4} && make install
35+
3036
# #### Abseil
3137

3238
# ```bash
@@ -62,7 +68,7 @@ RUN apt-get update && \
6268

6369
# ```bash
6470
WORKDIR /var/tmp/build/protobuf
65-
RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v31.1.tar.gz | \
71+
RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v33.1.tar.gz | \
6672
tar -xzf - --strip-components=1 && \
6773
cmake \
6874
-DCMAKE_BUILD_TYPE=Release \
@@ -98,7 +104,7 @@ RUN curl -fsSL https://github.com/google/re2/archive/2025-07-22.tar.gz | \
98104

99105
# ```bash
100106
WORKDIR /var/tmp/build/grpc
101-
RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.74.1.tar.gz | \
107+
RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.76.0.tar.gz | \
102108
tar -xzf - --strip-components=1 && \
103109
cmake \
104110
-DCMAKE_BUILD_TYPE=Release \
@@ -144,6 +150,9 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24
144150

145151
## [DONE packaging.md]
146152

153+
RUN apt-get update && \
154+
apt-get --no-install-recommends install -y gdb
155+
147156
WORKDIR /var/tmp/sccache
148157
RUN curl -fsSL https://github.com/mozilla/sccache/releases/download/v0.10.0/sccache-v0.10.0-x86_64-unknown-linux-musl.tar.gz | \
149158
tar -zxf - --strip-components=1 && \

‎ci/cloudbuild/dockerfiles/demo-fedora.Dockerfile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,8 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24
8989

9090
## [DONE packaging.md]
9191

92+
RUN dnf makecache && dnf install -y gdb
93+
9294
WORKDIR /var/tmp/sccache
9395
RUN curl -fsSL https://github.com/mozilla/sccache/releases/download/v0.10.0/sccache-v0.10.0-x86_64-unknown-linux-musl.tar.gz | \
9496
tar -zxf - --strip-components=1 && \

‎ci/cloudbuild/dockerfiles/demo-opensuse-leap.Dockerfile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,9 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24
7979

8080
## [DONE packaging.md]
8181

82+
RUN zypper refresh && \
83+
zypper install --allow-downgrade -y gdb
84+
8285
WORKDIR /var/tmp/sccache
8386
RUN curl -fsSL https://github.com/mozilla/sccache/releases/download/v0.10.0/sccache-v0.10.0-x86_64-unknown-linux-musl.tar.gz | \
8487
tar -zxf - --strip-components=1 && \

‎ci/cloudbuild/dockerfiles/demo-rockylinux-9.Dockerfile‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ RUN curl -fsSL https://github.com/abseil/abseil-cpp/archive/20250814.1.tar.gz |
9191

9292
# ```bash
9393
WORKDIR /var/tmp/build/protobuf
94-
RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v31.1.tar.gz | \
94+
RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v33.1.tar.gz | \
9595
tar -xzf - --strip-components=1 && \
9696
cmake \
9797
-DCMAKE_BUILD_TYPE=Release \
@@ -133,7 +133,7 @@ RUN curl -fsSL https://github.com/google/re2/archive/2025-07-22.tar.gz | \
133133

134134
# ```bash
135135
WORKDIR /var/tmp/build/grpc
136-
RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.74.1.tar.gz | \
136+
RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.76.0.tar.gz | \
137137
tar -xzf - --strip-components=1 && \
138138
cmake \
139139
-DCMAKE_CXX_STANDARD=17 \
@@ -201,6 +201,8 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24
201201

202202
## [DONE packaging.md]
203203

204+
RUN dnf makecache && dnf update -y && dnf install -y gdb
205+
204206
WORKDIR /var/tmp/sccache
205207
RUN curl -fsSL https://github.com/mozilla/sccache/releases/download/v0.10.0/sccache-v0.10.0-x86_64-unknown-linux-musl.tar.gz | \
206208
tar -zxf - --strip-components=1 && \

‎ci/cloudbuild/dockerfiles/demo-ubuntu-24.04.Dockerfile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,9 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24
101101

102102
## [DONE packaging.md]
103103

104+
RUN apt-get update && \
105+
apt-get --no-install-recommends install -y gdb
106+
104107
WORKDIR /var/tmp/sccache
105108
RUN curl -fsSL https://github.com/mozilla/sccache/releases/download/v0.10.0/sccache-v0.10.0-x86_64-unknown-linux-musl.tar.gz | \
106109
tar -zxf - --strip-components=1 && \

‎ci/cloudbuild/dockerfiles/demo-ubuntu-focal.Dockerfile‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ RUN curl -fsSL https://github.com/abseil/abseil-cpp/archive/20250814.1.tar.gz |
5252

5353
# ```bash
5454
WORKDIR /var/tmp/build/protobuf
55-
RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v31.1.tar.gz | \
55+
RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v33.1.tar.gz | \
5656
tar -xzf - --strip-components=1 && \
5757
cmake \
5858
-DCMAKE_BUILD_TYPE=Release \
@@ -92,7 +92,7 @@ RUN curl -fsSL https://github.com/google/re2/archive/2025-07-22.tar.gz | \
9292

9393
# ```bash
9494
WORKDIR /var/tmp/build/grpc
95-
RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.74.1.tar.gz | \
95+
RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.76.0.tar.gz | \
9696
tar -xzf - --strip-components=1 && \
9797
cmake \
9898
-DCMAKE_BUILD_TYPE=Release \
@@ -160,6 +160,9 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24
160160

161161
## [DONE packaging.md]
162162

163+
RUN apt-get update && \
164+
apt-get --no-install-recommends install -y gdb
165+
163166
WORKDIR /var/tmp/sccache
164167
RUN curl -fsSL https://github.com/mozilla/sccache/releases/download/v0.10.0/sccache-v0.10.0-x86_64-unknown-linux-musl.tar.gz | \
165168
tar -zxf - --strip-components=1 && \

‎ci/cloudbuild/dockerfiles/demo-ubuntu-jammy.Dockerfile‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ RUN curl -fsSL https://github.com/abseil/abseil-cpp/archive/20250814.1.tar.gz |
5252

5353
# ```bash
5454
WORKDIR /var/tmp/build/protobuf
55-
RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v31.1.tar.gz | \
55+
RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v33.1.tar.gz | \
5656
tar -xzf - --strip-components=1 && \
5757
cmake \
5858
-DCMAKE_BUILD_TYPE=Release \
@@ -73,7 +73,7 @@ RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v31.1.tar.gz
7373

7474
# ```bash
7575
WORKDIR /var/tmp/build/grpc
76-
RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.74.1.tar.gz | \
76+
RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.76.0.tar.gz | \
7777
tar -xzf - --strip-components=1 && \
7878
cmake \
7979
-DCMAKE_BUILD_TYPE=Release \
@@ -141,6 +141,9 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24
141141

142142
## [DONE packaging.md]
143143

144+
RUN apt-get update && \
145+
apt-get --no-install-recommends install -y gdb
146+
144147
WORKDIR /var/tmp/sccache
145148
RUN curl -fsSL https://github.com/mozilla/sccache/releases/download/v0.10.0/sccache-v0.10.0-x86_64-unknown-linux-musl.tar.gz | \
146149
tar -zxf - --strip-components=1 && \

0 commit comments

Comments
 (0)