From 01f99d92403596076fe5c6e3f0ddec28e9b47a20 Mon Sep 17 00:00:00 2001 From: Scott Hart Date: Fri, 20 Nov 2026 21:30:33 -0500 Subject: [PATCH] chore: update gRPC to v1.85.4 --- MODULE.bazel | 2 +- .../dockerfiles/demo-debian-bookworm.Dockerfile | 2 +- ci/cloudbuild/dockerfiles/demo-fedora.Dockerfile | 2 +- .../dockerfiles/demo-opensuse-leap.Dockerfile | 2 +- .../dockerfiles/demo-rockylinux-9.Dockerfile | 2 +- .../dockerfiles/demo-ubuntu-24.04.Dockerfile | 2 +- .../dockerfiles/demo-ubuntu-jammy.Dockerfile | 2 +- .../dockerfiles/fedora-cmake-quickstart.Dockerfile | 2 +- .../dockerfiles/fedora-latest-cmake.Dockerfile | 2 +- .../dockerfiles/fedora-latest-cxx20.Dockerfile | 2 +- .../fedora-latest-publish-docs.Dockerfile | 2 +- .../dockerfiles/fedora-openssl-4.Dockerfile | 2 +- ci/cloudbuild/dockerfiles/gcc-oldest.Dockerfile | 7 +++++-- .../dockerfiles/ubuntu-20.04-install.Dockerfile | 2 +- .../dockerfiles/ubuntu-22.04-install.Dockerfile | 2 +- ci/verify_bzlmod_latest/MODULE.bazel | 2 +- doc/packaging.md | 12 ++++++------ 17 files changed, 26 insertions(+), 23 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index c40ca8c389e6c..7b7b47ce26f85 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -51,7 +51,7 @@ python.toolchain( python_version = "3.11", ) -bazel_dep(name = "grpc", version = "1.85.1") +bazel_dep(name = "grpc", version = "1.85.4") bazel_dep(name = "googleapis", version = "0.0.0-20261103-57aa4dbc") bazel_dep(name = "googleapis-cc", version = "1.1.5") bazel_dep(name = "googleapis-grpc-cc", version = "1.1.5") diff --git a/ci/cloudbuild/dockerfiles/demo-debian-bookworm.Dockerfile b/ci/cloudbuild/dockerfiles/demo-debian-bookworm.Dockerfile index 647f42644acca..ba62b754a9842 100644 --- a/ci/cloudbuild/dockerfiles/demo-debian-bookworm.Dockerfile +++ b/ci/cloudbuild/dockerfiles/demo-debian-bookworm.Dockerfile @@ -177,7 +177,7 @@ WORKDIR /var/tmp/build/grpc ## at build or run time. RUN apt-get update && apt-get --no-install-recommends install -y golang-go ## [DONE IGNORED] -RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.85.1.tar.gz | \ +RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.85.4.tar.gz | \ tar -xzf - --strip-components=1 && \ mkdir -p third_party/grpc-proto && \ curl -fsSL https://github.com/grpc/grpc-proto/archive/ec30f589e2519d595688b9a42f88a91bdd6b733f.tar.gz | \ diff --git a/ci/cloudbuild/dockerfiles/demo-fedora.Dockerfile b/ci/cloudbuild/dockerfiles/demo-fedora.Dockerfile index bbd359ef8ce35..fa2281011ccfe 100644 --- a/ci/cloudbuild/dockerfiles/demo-fedora.Dockerfile +++ b/ci/cloudbuild/dockerfiles/demo-fedora.Dockerfile @@ -155,7 +155,7 @@ RUN dnf makecache && dnf install -y c-ares-devel re2-devel ## at build or run time. RUN dnf makecache && dnf install -y golang ## [DONE IGNORED] -RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.85.1.tar.gz | \ +RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.85.4.tar.gz | \ tar -xzf - --strip-components=1 && \ mkdir -p third_party/grpc-proto && \ curl -fsSL https://github.com/grpc/grpc-proto/archive/ec30f589e2519d595688b9a42f88a91bdd6b733f.tar.gz | \ diff --git a/ci/cloudbuild/dockerfiles/demo-opensuse-leap.Dockerfile b/ci/cloudbuild/dockerfiles/demo-opensuse-leap.Dockerfile index 4bbb769ec04a0..6c10955e3e13a 100644 --- a/ci/cloudbuild/dockerfiles/demo-opensuse-leap.Dockerfile +++ b/ci/cloudbuild/dockerfiles/demo-opensuse-leap.Dockerfile @@ -152,7 +152,7 @@ WORKDIR /var/tmp/build/grpc ## at build or run time. RUN zypper refresh && zypper install --allow-downgrade -y go ## [DONE IGNORED] -RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.85.1.tar.gz | \ +RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.85.4.tar.gz | \ tar -xzf - --strip-components=1 && \ mkdir -p third_party/grpc-proto && \ curl -fsSL https://github.com/grpc/grpc-proto/archive/ec30f589e2519d595688b9a42f88a91bdd6b733f.tar.gz | \ diff --git a/ci/cloudbuild/dockerfiles/demo-rockylinux-9.Dockerfile b/ci/cloudbuild/dockerfiles/demo-rockylinux-9.Dockerfile index 4b7048e6e939f..ced821f74fe44 100644 --- a/ci/cloudbuild/dockerfiles/demo-rockylinux-9.Dockerfile +++ b/ci/cloudbuild/dockerfiles/demo-rockylinux-9.Dockerfile @@ -171,7 +171,7 @@ WORKDIR /var/tmp/build/grpc ## at build or run time. RUN dnf makecache && dnf install -y golang ## [DONE IGNORED] -RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.85.1.tar.gz | \ +RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.85.4.tar.gz | \ tar -xzf - --strip-components=1 && \ mkdir -p third_party/grpc-proto && \ curl -fsSL https://github.com/grpc/grpc-proto/archive/ec30f589e2519d595688b9a42f88a91bdd6b733f.tar.gz | \ diff --git a/ci/cloudbuild/dockerfiles/demo-ubuntu-24.04.Dockerfile b/ci/cloudbuild/dockerfiles/demo-ubuntu-24.04.Dockerfile index 47c5733f9b805..9c3cea0982b9f 100644 --- a/ci/cloudbuild/dockerfiles/demo-ubuntu-24.04.Dockerfile +++ b/ci/cloudbuild/dockerfiles/demo-ubuntu-24.04.Dockerfile @@ -177,7 +177,7 @@ WORKDIR /var/tmp/build/grpc ## at build or run time. RUN apt-get update && apt-get --no-install-recommends install -y golang-go ## [DONE IGNORED] -RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.85.1.tar.gz | \ +RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.85.4.tar.gz | \ tar -xzf - --strip-components=1 && \ mkdir -p third_party/grpc-proto && \ curl -fsSL https://github.com/grpc/grpc-proto/archive/ec30f589e2519d595688b9a42f88a91bdd6b733f.tar.gz | \ diff --git a/ci/cloudbuild/dockerfiles/demo-ubuntu-jammy.Dockerfile b/ci/cloudbuild/dockerfiles/demo-ubuntu-jammy.Dockerfile index ba6a65294fcdb..ab86cd4404cb4 100644 --- a/ci/cloudbuild/dockerfiles/demo-ubuntu-jammy.Dockerfile +++ b/ci/cloudbuild/dockerfiles/demo-ubuntu-jammy.Dockerfile @@ -108,7 +108,7 @@ WORKDIR /var/tmp/build/grpc ## at build or run time. RUN apt-get update && apt-get --no-install-recommends install -y golang-go ## [DONE IGNORED] -RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.85.1.tar.gz | \ +RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.85.4.tar.gz | \ tar -xzf - --strip-components=1 && \ mkdir -p third_party/grpc-proto && \ curl -fsSL https://github.com/grpc/grpc-proto/archive/ec30f589e2519d595688b9a42f88a91bdd6b733f.tar.gz | \ diff --git a/ci/cloudbuild/dockerfiles/fedora-cmake-quickstart.Dockerfile b/ci/cloudbuild/dockerfiles/fedora-cmake-quickstart.Dockerfile index 6dd9fb4ef9d93..94e15cf35cf3f 100644 --- a/ci/cloudbuild/dockerfiles/fedora-cmake-quickstart.Dockerfile +++ b/ci/cloudbuild/dockerfiles/fedora-cmake-quickstart.Dockerfile @@ -185,7 +185,7 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24 # at build or run time. WORKDIR /var/tmp/build/grpc RUN dnf makecache && dnf install -y c-ares-devel golang re2-devel -RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.85.1.tar.gz | \ +RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.85.4.tar.gz | \ tar -xzf - --strip-components=1 && \ mkdir -p third_party/grpc-proto && \ curl -fsSL https://github.com/grpc/grpc-proto/archive/ec30f589e2519d595688b9a42f88a91bdd6b733f.tar.gz | \ diff --git a/ci/cloudbuild/dockerfiles/fedora-latest-cmake.Dockerfile b/ci/cloudbuild/dockerfiles/fedora-latest-cmake.Dockerfile index e9b8162bb63c7..ce3931e53ff2e 100644 --- a/ci/cloudbuild/dockerfiles/fedora-latest-cmake.Dockerfile +++ b/ci/cloudbuild/dockerfiles/fedora-latest-cmake.Dockerfile @@ -179,7 +179,7 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.28 WORKDIR /var/tmp/build/grpc RUN dnf makecache && dnf install -y c-ares-devel re2-devel -RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.85.1.tar.gz | \ +RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.85.4.tar.gz | \ tar -xzf - --strip-components=1 && \ mkdir -p third_party/grpc-proto && \ curl -fsSL https://github.com/grpc/grpc-proto/archive/ec30f589e2519d595688b9a42f88a91bdd6b733f.tar.gz | \ diff --git a/ci/cloudbuild/dockerfiles/fedora-latest-cxx20.Dockerfile b/ci/cloudbuild/dockerfiles/fedora-latest-cxx20.Dockerfile index 40a330dfd22ca..da1c786648002 100644 --- a/ci/cloudbuild/dockerfiles/fedora-latest-cxx20.Dockerfile +++ b/ci/cloudbuild/dockerfiles/fedora-latest-cxx20.Dockerfile @@ -176,7 +176,7 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.28 WORKDIR /var/tmp/build/grpc RUN dnf makecache && dnf install -y c-ares-devel re2-devel -RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.85.1.tar.gz | \ +RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.85.4.tar.gz | \ tar -xzf - --strip-components=1 && \ mkdir -p third_party/grpc-proto && \ curl -fsSL https://github.com/grpc/grpc-proto/archive/ec30f589e2519d595688b9a42f88a91bdd6b733f.tar.gz | \ diff --git a/ci/cloudbuild/dockerfiles/fedora-latest-publish-docs.Dockerfile b/ci/cloudbuild/dockerfiles/fedora-latest-publish-docs.Dockerfile index 7ca17d60ee165..317d7c11aa529 100644 --- a/ci/cloudbuild/dockerfiles/fedora-latest-publish-docs.Dockerfile +++ b/ci/cloudbuild/dockerfiles/fedora-latest-publish-docs.Dockerfile @@ -133,7 +133,7 @@ RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v36.0.tar.gz WORKDIR /var/tmp/build/grpc RUN dnf makecache && dnf install -y c-ares-devel re2-devel -RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.85.1.tar.gz | \ +RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.85.4.tar.gz | \ tar -xzf - --strip-components=1 && \ mkdir -p third_party/grpc-proto && \ curl -fsSL https://github.com/grpc/grpc-proto/archive/ec30f589e2519d595688b9a42f88a91bdd6b733f.tar.gz | \ diff --git a/ci/cloudbuild/dockerfiles/fedora-openssl-4.Dockerfile b/ci/cloudbuild/dockerfiles/fedora-openssl-4.Dockerfile index ea34e8282cead..ae43e04b16ba3 100644 --- a/ci/cloudbuild/dockerfiles/fedora-openssl-4.Dockerfile +++ b/ci/cloudbuild/dockerfiles/fedora-openssl-4.Dockerfile @@ -191,7 +191,7 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.28 WORKDIR /var/tmp/build/grpc RUN dnf makecache && dnf install -y c-ares-devel re2-devel -RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.85.1.tar.gz | \ +RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.85.4.tar.gz | \ tar -xzf - --strip-components=1 && \ mkdir -p third_party/grpc-proto && \ curl -fsSL https://github.com/grpc/grpc-proto/archive/ec30f589e2519d595688b9a42f88a91bdd6b733f.tar.gz | \ diff --git a/ci/cloudbuild/dockerfiles/gcc-oldest.Dockerfile b/ci/cloudbuild/dockerfiles/gcc-oldest.Dockerfile index 28a5f9d5ed52a..964388626698e 100644 --- a/ci/cloudbuild/dockerfiles/gcc-oldest.Dockerfile +++ b/ci/cloudbuild/dockerfiles/gcc-oldest.Dockerfile @@ -32,7 +32,7 @@ RUN ln -s /usr/bin/g++-10 /usr/local/bin/g++ RUN ln -s /usr/bin/gcc-10 /usr/local/bin/gcc WORKDIR /var/tmp/build -RUN curl -fsSL https://github.com/abseil/abseil-cpp/archive/20250127.2.tar.gz | \ +RUN curl -fsSL https://github.com/abseil/abseil-cpp/archive/20250814.2.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_CXX_STANDARD=17 \ @@ -117,8 +117,11 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24 ldconfig && cd /var/tmp && rm -fr build WORKDIR /var/tmp/build/grpc -RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.81.0.tar.gz | \ +RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.85.4.tar.gz | \ tar -xzf - --strip-components=1 && \ + mkdir -p third_party/grpc-proto && \ + curl -fsSL https://github.com/grpc/grpc-proto/archive/ec30f589e2519d595688b9a42f88a91bdd6b733f.tar.gz | \ + tar -xzf - -C third_party/grpc-proto --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_CXX_STANDARD=17 \ diff --git a/ci/cloudbuild/dockerfiles/ubuntu-20.04-install.Dockerfile b/ci/cloudbuild/dockerfiles/ubuntu-20.04-install.Dockerfile index 3fb2ae9c3f8c4..9487333e9d112 100644 --- a/ci/cloudbuild/dockerfiles/ubuntu-20.04-install.Dockerfile +++ b/ci/cloudbuild/dockerfiles/ubuntu-20.04-install.Dockerfile @@ -183,7 +183,7 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24 ldconfig && cd /var/tmp && rm -fr build WORKDIR /var/tmp/build/grpc -RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.85.1.tar.gz | \ +RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.85.4.tar.gz | \ tar -xzf - --strip-components=1 && \ mkdir -p third_party/grpc-proto && \ curl -fsSL https://github.com/grpc/grpc-proto/archive/ec30f589e2519d595688b9a42f88a91bdd6b733f.tar.gz | \ diff --git a/ci/cloudbuild/dockerfiles/ubuntu-22.04-install.Dockerfile b/ci/cloudbuild/dockerfiles/ubuntu-22.04-install.Dockerfile index 9305b92480075..70356baf705df 100644 --- a/ci/cloudbuild/dockerfiles/ubuntu-22.04-install.Dockerfile +++ b/ci/cloudbuild/dockerfiles/ubuntu-22.04-install.Dockerfile @@ -182,7 +182,7 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24 ldconfig && cd /var/tmp && rm -fr build WORKDIR /var/tmp/build/grpc -RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.85.1.tar.gz | \ +RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.85.4.tar.gz | \ tar -xzf - --strip-components=1 && \ mkdir -p third_party/grpc-proto && \ curl -fsSL https://github.com/grpc/grpc-proto/archive/ec30f589e2519d595688b9a42f88a91bdd6b733f.tar.gz | \ diff --git a/ci/verify_bzlmod_latest/MODULE.bazel b/ci/verify_bzlmod_latest/MODULE.bazel index 8bb886ad8b579..2176a60bde952 100644 --- a/ci/verify_bzlmod_latest/MODULE.bazel +++ b/ci/verify_bzlmod_latest/MODULE.bazel @@ -45,7 +45,7 @@ python.toolchain( python_version = "3.11", ) -bazel_dep(name = "grpc", version = "1.85.1") +bazel_dep(name = "grpc", version = "1.85.4") bazel_dep(name = "googleapis", version = "0.0.0-20260929-28769825") bazel_dep(name = "googleapis-cc", version = "1.1.5") bazel_dep(name = "googleapis-grpc-cc", version = "1.1.5") diff --git a/doc/packaging.md b/doc/packaging.md index da292b3f1ea03..1b754f45389a1 100644 --- a/doc/packaging.md +++ b/doc/packaging.md @@ -360,7 +360,7 @@ sudo ldconfig ```bash mkdir -p $HOME/Downloads/grpc && cd $HOME/Downloads/grpc sudo dnf makecache && sudo dnf install -y c-ares-devel re2-devel -curl -fsSL https://github.com/grpc/grpc/archive/v1.85.1.tar.gz | \ +curl -fsSL https://github.com/grpc/grpc/archive/v1.85.4.tar.gz | \ tar -xzf - --strip-components=1 && \ mkdir -p third_party/grpc-proto && \ curl -fsSL https://github.com/grpc/grpc-proto/archive/ec30f589e2519d595688b9a42f88a91bdd6b733f.tar.gz | \ @@ -533,7 +533,7 @@ sudo ldconfig ```bash mkdir -p $HOME/Downloads/grpc && cd $HOME/Downloads/grpc -curl -fsSL https://github.com/grpc/grpc/archive/v1.85.1.tar.gz | \ +curl -fsSL https://github.com/grpc/grpc/archive/v1.85.4.tar.gz | \ tar -xzf - --strip-components=1 && \ mkdir -p third_party/grpc-proto && \ curl -fsSL https://github.com/grpc/grpc-proto/archive/ec30f589e2519d595688b9a42f88a91bdd6b733f.tar.gz | \ @@ -734,7 +734,7 @@ sudo ldconfig ```bash mkdir -p $HOME/Downloads/grpc && cd $HOME/Downloads/grpc -curl -fsSL https://github.com/grpc/grpc/archive/v1.85.1.tar.gz | \ +curl -fsSL https://github.com/grpc/grpc/archive/v1.85.4.tar.gz | \ tar -xzf - --strip-components=1 && \ mkdir -p third_party/grpc-proto && \ curl -fsSL https://github.com/grpc/grpc-proto/archive/ec30f589e2519d595688b9a42f88a91bdd6b733f.tar.gz | \ @@ -867,7 +867,7 @@ Platform proto files. We install it using: ```bash mkdir -p $HOME/Downloads/grpc && cd $HOME/Downloads/grpc -curl -fsSL https://github.com/grpc/grpc/archive/v1.85.1.tar.gz | \ +curl -fsSL https://github.com/grpc/grpc/archive/v1.85.4.tar.gz | \ tar -xzf - --strip-components=1 && \ mkdir -p third_party/grpc-proto && \ curl -fsSL https://github.com/grpc/grpc-proto/archive/ec30f589e2519d595688b9a42f88a91bdd6b733f.tar.gz | \ @@ -1109,7 +1109,7 @@ sudo ldconfig ```bash mkdir -p $HOME/Downloads/grpc && cd $HOME/Downloads/grpc -curl -fsSL https://github.com/grpc/grpc/archive/v1.85.1.tar.gz | \ +curl -fsSL https://github.com/grpc/grpc/archive/v1.85.4.tar.gz | \ tar -xzf - --strip-components=1 && \ mkdir -p third_party/grpc-proto && \ curl -fsSL https://github.com/grpc/grpc-proto/archive/ec30f589e2519d595688b9a42f88a91bdd6b733f.tar.gz | \ @@ -1304,7 +1304,7 @@ install it using: ```bash mkdir -p $HOME/Downloads/grpc && cd $HOME/Downloads/grpc -curl -fsSL https://github.com/grpc/grpc/archive/v1.85.1.tar.gz | \ +curl -fsSL https://github.com/grpc/grpc/archive/v1.85.4.tar.gz | \ tar -xzf - --strip-components=1 && \ mkdir -p third_party/grpc-proto && \ curl -fsSL https://github.com/grpc/grpc-proto/archive/ec30f589e2519d595688b9a42f88a91bdd6b733f.tar.gz | \