Skip to content

Commit ccd5fbc

Browse files
authored
chore: upgrade some builds to grpc 1.83.0 (googleapis#16272)
1 parent 0ba8e5f commit ccd5fbc

27 files changed

Lines changed: 79 additions & 60 deletions

MODULE.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ bazel_dep(name = "abseil-cpp", version = "20250814.2")
2929
# The name "com_google_protobuf" is internally used by @bazel_tools,
3030
# a native repository we cannot override.
3131
# See https://github.com/googleapis/google-cloud-cpp/issues/15393
32-
bazel_dep(name = "protobuf", version = "33.6", repo_name = "com_google_protobuf")
32+
bazel_dep(name = "protobuf", version = "35.1", repo_name = "com_google_protobuf")
3333
bazel_dep(name = "boringssl", version = "0.20251124.0")
3434
bazel_dep(name = "nlohmann_json", version = "3.12.0.bcr.1")
3535
bazel_dep(name = "curl", version = "8.8.0.bcr.3")
@@ -52,7 +52,7 @@ python.toolchain(
5252
python_version = "3.11",
5353
)
5454

55-
bazel_dep(name = "grpc", version = "1.81.0")
55+
bazel_dep(name = "grpc", version = "1.83.0")
5656
bazel_dep(name = "googleapis", version = "0.0.0-20260623-b6f9ff05")
5757
bazel_dep(name = "googleapis-cc", version = "1.1.5")
5858
bazel_dep(name = "googleapis-grpc-cc", version = "1.1.5")

ci/cloudbuild/builds/bazel-oldest.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
set -euo pipefail
1818

1919
export USE_BAZEL_VERSION=7.7.1
20+
export GOOGLE_CLOUD_CPP_CI_BAZEL_USE_WORKSPACE=true
2021

2122
source "$(dirname "$0")/../../lib/init.sh"
2223
source module ci/cloudbuild/builds/lib/bazel.sh

ci/cloudbuild/builds/lib/bazel.sh

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,25 +28,13 @@ source module ci/lib/io.sh
2828
io::log "Using bazelisk version"
2929
bazelisk version
3030

31-
io::log "Prefetching bazel deps..."
32-
# Bazel downloads all the dependencies of a project, as well as a number of
33-
# development tools during startup. In automated builds these downloads fail
34-
# from time to time due to transient network problems. Running `bazel fetch` at
35-
# the beginning of the build prevents such transient failures from flaking the
36-
# build.
37-
TIMEFORMAT="==> 🕑 prefetching done in %R seconds"
38-
time {
39-
"ci/retry-command.sh" 3 120 bazel fetch ...
40-
}
41-
echo >&2
42-
4331
# Outputs a list of args that should be given to all bazel invocations. To read
4432
# this into an array use `mapfile -t my_array < <(bazel::common_args)`
4533
function bazel::common_args() {
4634
function should_cache_test_results() {
4735
# Disables test caching on ci and daily builds to surface flaky tests.
4836
# Enables test caching on other builds to avoid surfacing unrelated flakes.
49-
case "${TRIGGER_TYPE}" in
37+
case "${TRIGGER_TYPE:-}" in
5038
ci | daily)
5139
echo no
5240
;;
@@ -73,3 +61,27 @@ function bazel::common_args() {
7361
fi
7462
printf "%s\n" "${args[@]}"
7563
}
64+
65+
# Bazel downloads all the dependencies of a project, as well as a number of
66+
# development tools during startup. In automated builds these downloads fail
67+
# from time to time due to transient network problems. Running `bazel fetch` at
68+
# the beginning of the build prevents such transient failures from flaking the
69+
# build.
70+
function bazel::prefetch() {
71+
local args
72+
mapfile -t args < <(bazel::common_args)
73+
if [[ "${GOOGLE_CLOUD_CPP_CI_BAZEL_USE_WORKSPACE:-}" == "true" ]]; then
74+
args+=(
75+
"--noenable_bzlmod"
76+
"--enable_workspace"
77+
)
78+
fi
79+
"ci/retry-command.sh" 3 120 bazel fetch "${args[@]}" ...
80+
}
81+
82+
io::log "Prefetching bazel deps..."
83+
TIMEFORMAT="==> 🕑 prefetching done in %R seconds"
84+
time {
85+
bazel::prefetch
86+
}
87+
echo >&2

ci/cloudbuild/dockerfiles/fedora-latest-cmake.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24
160160

161161
WORKDIR /var/tmp/build/grpc
162162
RUN dnf makecache && dnf install -y c-ares-devel re2-devel
163-
RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.81.0.tar.gz | \
163+
RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.83.0.tar.gz | \
164164
tar -xzf - --strip-components=1 && \
165165
cmake \
166166
-DCMAKE_BUILD_TYPE=Release \

ci/cloudbuild/dockerfiles/fedora-latest-cxx20.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24
157157

158158
WORKDIR /var/tmp/build/grpc
159159
RUN dnf makecache && dnf install -y c-ares-devel re2-devel
160-
RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.81.0.tar.gz | \
160+
RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.83.0.tar.gz | \
161161
tar -xzf - --strip-components=1 && \
162162
cmake \
163163
-DCMAKE_CXX_STANDARD=20 \

ci/cloudbuild/dockerfiles/fedora-latest-publish-docs.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v33.6.tar.gz
102102

103103
WORKDIR /var/tmp/build/grpc
104104
RUN dnf makecache && dnf install -y c-ares-devel re2-devel
105-
RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.81.0.tar.gz | \
105+
RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.83.0.tar.gz | \
106106
tar -xzf - --strip-components=1 && \
107107
cmake \
108108
-DCMAKE_BUILD_TYPE=Release \

ci/cloudbuild/dockerfiles/ubuntu-20.04-install.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24
163163
ldconfig && cd /var/tmp && rm -fr build
164164

165165
WORKDIR /var/tmp/build/grpc
166-
RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.81.0.tar.gz | \
166+
RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.83.0.tar.gz | \
167167
tar -xzf - --strip-components=1 && \
168168
cmake \
169169
-DCMAKE_BUILD_TYPE=Release \

ci/cloudbuild/dockerfiles/ubuntu-22.04-install.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24
162162
ldconfig && cd /var/tmp && rm -fr build
163163

164164
WORKDIR /var/tmp/build/grpc
165-
RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.81.0.tar.gz | \
165+
RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.83.0.tar.gz | \
166166
tar -xzf - --strip-components=1 && \
167167
cmake \
168168
-DCMAKE_BUILD_TYPE=Release \

ci/gha/builds/lib/bazel.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,12 @@ function bazel::integration_test_args() {
103103
function bazel::prefetch() {
104104
local args
105105
mapfile -t args < <(bazel::common_args)
106+
if [[ "${GOOGLE_CLOUD_CPP_CI_BAZEL_USE_WORKSPACE:-}" == "true" ]]; then
107+
args+=(
108+
"--noenable_bzlmod"
109+
"--enable_workspace"
110+
)
111+
fi
106112
local common_rules=(
107113
"..."
108114
)

google/cloud/aiplatform/v1/dataset_client.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ class DatasetServiceClient {
287287
/// [`Status`]: @ref google::cloud::Status
288288
/// [google.cloud.aiplatform.v1.Dataset]: @googleapis_reference_link{google/cloud/aiplatform/v1/dataset.proto#L36}
289289
/// [google.cloud.aiplatform.v1.UpdateDatasetRequest]: @googleapis_reference_link{google/cloud/aiplatform/v1/dataset_service.proto#L312}
290-
/// [google.protobuf.FieldMask]: @googleapis_reference_link{google/protobuf/field_mask.proto#L242}
290+
/// [google.protobuf.FieldMask]: @googleapis_reference_link{google/protobuf/field_mask.proto#L240}
291291
///
292292
// clang-format on
293293
StatusOr<google::cloud::aiplatform::v1::Dataset> UpdateDataset(
@@ -909,7 +909,7 @@ class DatasetServiceClient {
909909
/// [`Status`]: @ref google::cloud::Status
910910
/// [google.cloud.aiplatform.v1.DatasetVersion]: @googleapis_reference_link{google/cloud/aiplatform/v1/dataset_version.proto#L33}
911911
/// [google.cloud.aiplatform.v1.UpdateDatasetVersionRequest]: @googleapis_reference_link{google/cloud/aiplatform/v1/dataset_service.proto#L329}
912-
/// [google.protobuf.FieldMask]: @googleapis_reference_link{google/protobuf/field_mask.proto#L242}
912+
/// [google.protobuf.FieldMask]: @googleapis_reference_link{google/protobuf/field_mask.proto#L240}
913913
///
914914
// clang-format on
915915
StatusOr<google::cloud::aiplatform::v1::DatasetVersion> UpdateDatasetVersion(

0 commit comments

Comments
 (0)