From ba41d5a99818922b09eee5da148786c1d68c17f5 Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Fri, 23 Jul 2021 10:02:46 -0700 Subject: [PATCH] chore(deps): revert updates to gRPC 1.39.0 (#7049) This reverts commit 25c957c80be2965a9217ad5457cc9fe91e8b2cb9. This reverts commit ab4225d7568962b6f0907a4aecc57ac28c3db273. --- bazel/google_cloud_cpp_deps.bzl | 6 +++--- .../dockerfiles/demo-centos-7.Dockerfile | 2 +- .../dockerfiles/demo-debian-buster.Dockerfile | 2 +- .../dockerfiles/demo-debian-stretch.Dockerfile | 2 +- .../dockerfiles/demo-fedora.Dockerfile | 2 +- .../dockerfiles/demo-opensuse-leap.Dockerfile | 2 +- .../dockerfiles/demo-rockylinux-8.Dockerfile | 2 +- .../dockerfiles/demo-ubuntu-bionic.Dockerfile | 2 +- .../dockerfiles/demo-ubuntu-focal.Dockerfile | 2 +- .../dockerfiles/demo-ubuntu-xenial.Dockerfile | 2 +- ci/cloudbuild/dockerfiles/fedora-34.Dockerfile | 2 +- .../ubuntu-bionic-install.Dockerfile | 2 +- .../dockerfiles/ubuntu-xenial.Dockerfile | 2 +- doc/packaging.md | 18 +++++++++--------- 14 files changed, 24 insertions(+), 24 deletions(-) diff --git a/bazel/google_cloud_cpp_deps.bzl b/bazel/google_cloud_cpp_deps.bzl index 6572c57fb3f4..8e99bff83852 100644 --- a/bazel/google_cloud_cpp_deps.bzl +++ b/bazel/google_cloud_cpp_deps.bzl @@ -119,11 +119,11 @@ def google_cloud_cpp_deps(): if "com_github_grpc_grpc" not in native.existing_rules(): http_archive( name = "com_github_grpc_grpc", - strip_prefix = "grpc-1.39.0", + strip_prefix = "grpc-1.38.1", urls = [ - "https://github.com/grpc/grpc/archive/v1.39.0.tar.gz", + "https://github.com/grpc/grpc/archive/v1.38.1.tar.gz", ], - sha256 = "b16992aa1c949c10d5d5ce2a62f9d99fa7de77da2943e643fb66dcaf075826d6", + sha256 = "f60e5b112913bf776a22c16a3053cc02cf55e60bf27a959fd54d7aaf8e2da6e8", ) # We use the cc_proto_library() rule from @com_google_protobuf, which diff --git a/ci/cloudbuild/dockerfiles/demo-centos-7.Dockerfile b/ci/cloudbuild/dockerfiles/demo-centos-7.Dockerfile index 46394020ab2b..2818b34262d2 100644 --- a/ci/cloudbuild/dockerfiles/demo-centos-7.Dockerfile +++ b/ci/cloudbuild/dockerfiles/demo-centos-7.Dockerfile @@ -140,7 +140,7 @@ RUN curl -sSL https://github.com/c-ares/c-ares/archive/cares-1_14_0.tar.gz | \ # ```bash WORKDIR /var/tmp/build/grpc -RUN curl -sSL https://github.com/grpc/grpc/archive/v1.39.0.tar.gz | \ +RUN curl -sSL https://github.com/grpc/grpc/archive/v1.38.1.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/ci/cloudbuild/dockerfiles/demo-debian-buster.Dockerfile b/ci/cloudbuild/dockerfiles/demo-debian-buster.Dockerfile index 95503ab31980..711dc3abb269 100644 --- a/ci/cloudbuild/dockerfiles/demo-debian-buster.Dockerfile +++ b/ci/cloudbuild/dockerfiles/demo-debian-buster.Dockerfile @@ -114,7 +114,7 @@ RUN curl -sSL https://github.com/google/protobuf/archive/v3.15.8.tar.gz | \ # ```bash WORKDIR /var/tmp/build/grpc -RUN curl -sSL https://github.com/grpc/grpc/archive/v1.39.0.tar.gz | \ +RUN curl -sSL https://github.com/grpc/grpc/archive/v1.35.0.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/ci/cloudbuild/dockerfiles/demo-debian-stretch.Dockerfile b/ci/cloudbuild/dockerfiles/demo-debian-stretch.Dockerfile index fcbe11558c19..b1b3f5f1d122 100644 --- a/ci/cloudbuild/dockerfiles/demo-debian-stretch.Dockerfile +++ b/ci/cloudbuild/dockerfiles/demo-debian-stretch.Dockerfile @@ -111,7 +111,7 @@ RUN curl -sSL https://github.com/google/re2/archive/2020-11-01.tar.gz | \ # ```bash WORKDIR /var/tmp/build/grpc -RUN curl -sSL https://github.com/grpc/grpc/archive/v1.39.0.tar.gz | \ +RUN curl -sSL https://github.com/grpc/grpc/archive/v1.38.1.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/ci/cloudbuild/dockerfiles/demo-fedora.Dockerfile b/ci/cloudbuild/dockerfiles/demo-fedora.Dockerfile index 342f17927dd0..6717450718b9 100644 --- a/ci/cloudbuild/dockerfiles/demo-fedora.Dockerfile +++ b/ci/cloudbuild/dockerfiles/demo-fedora.Dockerfile @@ -128,7 +128,7 @@ RUN curl -sSL https://github.com/google/protobuf/archive/v3.15.8.tar.gz | \ # ```bash WORKDIR /var/tmp/build/grpc -RUN curl -sSL https://github.com/grpc/grpc/archive/v1.39.0.tar.gz | \ +RUN curl -sSL https://github.com/grpc/grpc/archive/v1.35.0.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/ci/cloudbuild/dockerfiles/demo-opensuse-leap.Dockerfile b/ci/cloudbuild/dockerfiles/demo-opensuse-leap.Dockerfile index eb02d497af07..d461609f82b5 100644 --- a/ci/cloudbuild/dockerfiles/demo-opensuse-leap.Dockerfile +++ b/ci/cloudbuild/dockerfiles/demo-opensuse-leap.Dockerfile @@ -100,7 +100,7 @@ RUN curl -sSL https://github.com/c-ares/c-ares/archive/cares-1_14_0.tar.gz | \ # ```bash WORKDIR /var/tmp/build/grpc -RUN curl -sSL https://github.com/grpc/grpc/archive/v1.39.0.tar.gz | \ +RUN curl -sSL https://github.com/grpc/grpc/archive/v1.38.1.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/ci/cloudbuild/dockerfiles/demo-rockylinux-8.Dockerfile b/ci/cloudbuild/dockerfiles/demo-rockylinux-8.Dockerfile index 56854f51fbe4..58cdd7b38210 100644 --- a/ci/cloudbuild/dockerfiles/demo-rockylinux-8.Dockerfile +++ b/ci/cloudbuild/dockerfiles/demo-rockylinux-8.Dockerfile @@ -87,7 +87,7 @@ RUN curl -sSL https://github.com/google/protobuf/archive/v3.17.3.tar.gz | \ # ```bash WORKDIR /var/tmp/build/grpc -RUN curl -sSL https://github.com/grpc/grpc/archive/v1.39.0.tar.gz | \ +RUN curl -sSL https://github.com/grpc/grpc/archive/v1.38.1.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/ci/cloudbuild/dockerfiles/demo-ubuntu-bionic.Dockerfile b/ci/cloudbuild/dockerfiles/demo-ubuntu-bionic.Dockerfile index e9ba86fa29e6..bb8afce0cf6d 100644 --- a/ci/cloudbuild/dockerfiles/demo-ubuntu-bionic.Dockerfile +++ b/ci/cloudbuild/dockerfiles/demo-ubuntu-bionic.Dockerfile @@ -90,7 +90,7 @@ RUN curl -sSL https://github.com/google/re2/archive/2020-11-01.tar.gz | \ # ```bash WORKDIR /var/tmp/build/grpc -RUN curl -sSL https://github.com/grpc/grpc/archive/v1.39.0.tar.gz | \ +RUN curl -sSL https://github.com/grpc/grpc/archive/v1.38.1.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/ci/cloudbuild/dockerfiles/demo-ubuntu-focal.Dockerfile b/ci/cloudbuild/dockerfiles/demo-ubuntu-focal.Dockerfile index c1ac1d5567a7..0cbbdbbcd74f 100644 --- a/ci/cloudbuild/dockerfiles/demo-ubuntu-focal.Dockerfile +++ b/ci/cloudbuild/dockerfiles/demo-ubuntu-focal.Dockerfile @@ -74,7 +74,7 @@ RUN curl -sSL https://github.com/google/protobuf/archive/v3.17.3.tar.gz | \ # ```bash WORKDIR /var/tmp/build/grpc -RUN curl -sSL https://github.com/grpc/grpc/archive/v1.39.0.tar.gz | \ +RUN curl -sSL https://github.com/grpc/grpc/archive/v1.38.1.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/ci/cloudbuild/dockerfiles/demo-ubuntu-xenial.Dockerfile b/ci/cloudbuild/dockerfiles/demo-ubuntu-xenial.Dockerfile index 110fbfe8e7e6..2b8d48ad4333 100644 --- a/ci/cloudbuild/dockerfiles/demo-ubuntu-xenial.Dockerfile +++ b/ci/cloudbuild/dockerfiles/demo-ubuntu-xenial.Dockerfile @@ -104,7 +104,7 @@ RUN curl -sSL https://github.com/google/re2/archive/2020-11-01.tar.gz | \ # ```bash WORKDIR /var/tmp/build/grpc -RUN curl -sSL https://github.com/grpc/grpc/archive/v1.39.0.tar.gz | \ +RUN curl -sSL https://github.com/grpc/grpc/archive/v1.38.1.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/ci/cloudbuild/dockerfiles/fedora-34.Dockerfile b/ci/cloudbuild/dockerfiles/fedora-34.Dockerfile index 893c7c5f3687..1063b8772acd 100644 --- a/ci/cloudbuild/dockerfiles/fedora-34.Dockerfile +++ b/ci/cloudbuild/dockerfiles/fedora-34.Dockerfile @@ -119,7 +119,7 @@ RUN curl -sSL https://github.com/google/protobuf/archive/v3.15.8.tar.gz | \ WORKDIR /var/tmp/build/grpc RUN dnf makecache && dnf install -y c-ares-devel re2-devel -RUN curl -sSL https://github.com/grpc/grpc/archive/v1.39.0.tar.gz | \ +RUN curl -sSL https://github.com/grpc/grpc/archive/v1.35.0.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/ci/cloudbuild/dockerfiles/ubuntu-bionic-install.Dockerfile b/ci/cloudbuild/dockerfiles/ubuntu-bionic-install.Dockerfile index 8ffde429cc3a..5256cb061613 100644 --- a/ci/cloudbuild/dockerfiles/ubuntu-bionic-install.Dockerfile +++ b/ci/cloudbuild/dockerfiles/ubuntu-bionic-install.Dockerfile @@ -155,7 +155,7 @@ RUN curl -sSL https://github.com/google/re2/archive/2020-11-01.tar.gz | \ cd /var/tmp && rm -fr build WORKDIR /var/tmp/build/grpc -RUN curl -sSL https://github.com/grpc/grpc/archive/v1.39.0.tar.gz | \ +RUN curl -sSL https://github.com/grpc/grpc/archive/v1.35.0.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/ci/cloudbuild/dockerfiles/ubuntu-xenial.Dockerfile b/ci/cloudbuild/dockerfiles/ubuntu-xenial.Dockerfile index cebb02fea1e6..d084efa865e6 100644 --- a/ci/cloudbuild/dockerfiles/ubuntu-xenial.Dockerfile +++ b/ci/cloudbuild/dockerfiles/ubuntu-xenial.Dockerfile @@ -154,7 +154,7 @@ RUN curl -sSL https://github.com/google/re2/archive/2020-11-01.tar.gz | \ cd /var/tmp && rm -fr build WORKDIR /var/tmp/build/grpc -RUN curl -sSL https://github.com/grpc/grpc/archive/v1.39.0.tar.gz | \ +RUN curl -sSL https://github.com/grpc/grpc/archive/v1.35.0.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/doc/packaging.md b/doc/packaging.md index e95e7f61d800..ec34e64509a6 100644 --- a/doc/packaging.md +++ b/doc/packaging.md @@ -318,7 +318,7 @@ Finally we build gRPC from source also: ```bash mkdir -p $HOME/Downloads/grpc && cd $HOME/Downloads/grpc -curl -sSL https://github.com/grpc/grpc/archive/v1.39.0.tar.gz | \ +curl -sSL https://github.com/grpc/grpc/archive/v1.35.0.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ @@ -440,7 +440,7 @@ Cloud Platform proto files. We manually install it using: ```bash mkdir -p $HOME/Downloads/grpc && cd $HOME/Downloads/grpc -curl -sSL https://github.com/grpc/grpc/archive/v1.39.0.tar.gz | \ +curl -sSL https://github.com/grpc/grpc/archive/v1.38.1.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ @@ -577,7 +577,7 @@ Cloud Platform proto files. We install it using: ```bash mkdir -p $HOME/Downloads/grpc && cd $HOME/Downloads/grpc -curl -sSL https://github.com/grpc/grpc/archive/v1.39.0.tar.gz | \ +curl -sSL https://github.com/grpc/grpc/archive/v1.38.1.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ @@ -730,7 +730,7 @@ Cloud Platform proto files. We install it using: ```bash mkdir -p $HOME/Downloads/grpc && cd $HOME/Downloads/grpc -curl -sSL https://github.com/grpc/grpc/archive/v1.39.0.tar.gz | \ +curl -sSL https://github.com/grpc/grpc/archive/v1.38.1.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ @@ -897,7 +897,7 @@ Cloud Platform proto files. We can install gRPC from source using: ```bash mkdir -p $HOME/Downloads/grpc && cd $HOME/Downloads/grpc -curl -sSL https://github.com/grpc/grpc/archive/v1.39.0.tar.gz | \ +curl -sSL https://github.com/grpc/grpc/archive/v1.38.1.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ @@ -1078,7 +1078,7 @@ Finally we build gRPC from source also: ```bash mkdir -p $HOME/Downloads/grpc && cd $HOME/Downloads/grpc -curl -sSL https://github.com/grpc/grpc/archive/v1.39.0.tar.gz | \ +curl -sSL https://github.com/grpc/grpc/archive/v1.35.0.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ @@ -1211,7 +1211,7 @@ Protobuf we just installed in `/usr/local`: ```bash mkdir -p $HOME/Downloads/grpc && cd $HOME/Downloads/grpc -curl -sSL https://github.com/grpc/grpc/archive/v1.39.0.tar.gz | \ +curl -sSL https://github.com/grpc/grpc/archive/v1.38.1.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ @@ -1365,7 +1365,7 @@ Cloud Platform proto files. We manually install it using: ```bash mkdir -p $HOME/Downloads/grpc && cd $HOME/Downloads/grpc -curl -sSL https://github.com/grpc/grpc/archive/v1.39.0.tar.gz | \ +curl -sSL https://github.com/grpc/grpc/archive/v1.38.1.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \ @@ -1555,7 +1555,7 @@ Cloud Platform proto files. We manually install it using: ```bash mkdir -p $HOME/Downloads/grpc && cd $HOME/Downloads/grpc -curl -sSL https://github.com/grpc/grpc/archive/v1.39.0.tar.gz | \ +curl -sSL https://github.com/grpc/grpc/archive/v1.38.1.tar.gz | \ tar -xzf - --strip-components=1 && \ cmake \ -DCMAKE_BUILD_TYPE=Release \