Skip to content

Commit 53a0f97

Browse files
authored
chore: update grpc to v1.68.2 (#14869)
1 parent 97d64d3 commit 53a0f97

13 files changed

+21
-18
lines changed

MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ bazel_dep(name = "rules_cc", version = "0.0.9")
2626
bazel_dep(name = "abseil-cpp", version = "20240722.0", repo_name = "com_google_absl")
2727
bazel_dep(name = "protobuf", version = "29.0", repo_name = "com_google_protobuf")
2828
bazel_dep(name = "boringssl", version = "0.0.0-20230215-5c22014")
29-
bazel_dep(name = "grpc", version = "1.66.0", repo_name = "com_github_grpc_grpc")
29+
bazel_dep(name = "grpc", version = "1.68.0", repo_name = "com_github_grpc_grpc")
3030
bazel_dep(name = "nlohmann_json", version = "3.11.3", repo_name = "com_github_nlohmann_json")
3131
bazel_dep(name = "curl", version = "8.8.0.bcr.1", repo_name = "com_github_curl_curl")
3232
bazel_dep(name = "crc32c", version = "1.1.0", repo_name = "com_github_google_crc32c")

bazel/workspace0.bzl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,10 +172,10 @@ def gl_cpp_workspace0(name = None):
172172
http_archive,
173173
name = "com_github_grpc_grpc",
174174
urls = [
175-
"https://github.com/grpc/grpc/archive/v1.67.0.tar.gz",
175+
"https://github.com/grpc/grpc/archive/v1.68.2.tar.gz",
176176
],
177-
sha256 = "af0638f73e4452e22e295f8b3f452518234254104713a08497f3d3aaa76733ad",
178-
strip_prefix = "grpc-1.67.0",
177+
sha256 = "afbc5d78d6ba6d509cc6e264de0d49dcd7304db435cbf2d630385bacf49e066c",
178+
strip_prefix = "grpc-1.68.2",
179179
)
180180

181181
# We use the cc_proto_library() rule from @com_google_protobuf, which

ci/cloudbuild/builds/asan.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@ source module ci/cloudbuild/builds/lib/integration.sh
2323
source module ci/lib/io.sh
2424

2525
mapfile -t args < <(bazel::common_args)
26-
args+=(--config=asan)
26+
args+=(--config=asan
27+
# TODO(#14874): re-enable bzlmod once BCR grpc module is fixed.
28+
--noenable_bzlmod
29+
)
2730
io::run bazel test "${args[@]}" --test_tag_filters=-integration-test "${BAZEL_TARGETS[@]}"
2831

2932
mapfile -t integration_args < <(integration::bazel_args)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ RUN curl -fsSL https://github.com/google/re2/archive/2024-07-02.tar.gz | \
125125

126126
# ```bash
127127
WORKDIR /var/tmp/build/grpc
128-
RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.67.0.tar.gz | \
128+
RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.68.2.tar.gz | \
129129
tar -xzf - --strip-components=1 && \
130130
cmake \
131131
-DCMAKE_BUILD_TYPE=Release \

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ RUN curl -fsSL https://github.com/google/re2/archive/2024-07-02.tar.gz | \
128128

129129
# ```bash
130130
WORKDIR /var/tmp/build/grpc
131-
RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.67.0.tar.gz | \
131+
RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.68.2.tar.gz | \
132132
tar -xzf - --strip-components=1 && \
133133
cmake \
134134
-DCMAKE_CXX_STANDARD=17 \

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ RUN curl -fsSL https://github.com/google/re2/archive/2024-07-02.tar.gz | \
9595

9696
# ```bash
9797
WORKDIR /var/tmp/build/grpc
98-
RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.67.0.tar.gz | \
98+
RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.68.2.tar.gz | \
9999
tar -xzf - --strip-components=1 && \
100100
cmake \
101101
-DCMAKE_BUILD_TYPE=Release \

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v29.0.tar.gz
7676

7777
# ```bash
7878
WORKDIR /var/tmp/build/grpc
79-
RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.67.0.tar.gz | \
79+
RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.68.2.tar.gz | \
8080
tar -xzf - --strip-components=1 && \
8181
cmake \
8282
-DCMAKE_BUILD_TYPE=Release \

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

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

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

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

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

168168
WORKDIR /var/tmp/build/grpc
169169
RUN dnf makecache && dnf install -y c-ares-devel re2-devel
170-
RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.67.0.tar.gz | \
170+
RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.68.2.tar.gz | \
171171
tar -xzf - --strip-components=1 && \
172172
cmake \
173173
-DCMAKE_CXX_STANDARD=14 \

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

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

170170
WORKDIR /var/tmp/build/grpc
171171
RUN dnf makecache && dnf install -y c-ares-devel re2-devel
172-
RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.67.0.tar.gz | \
172+
RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.68.2.tar.gz | \
173173
tar -xzf - --strip-components=1 && \
174174
cmake \
175175
-DCMAKE_CXX_STANDARD=20 \

0 commit comments

Comments
 (0)