Skip to content

Commit

Permalink
chore(deps): revert updates to gRPC 1.39.0 (googleapis#7049)
Browse files Browse the repository at this point in the history
This reverts commit 25c957c.
This reverts commit ab4225d.
  • Loading branch information
coryan committed Jul 23, 2021
1 parent e02afad commit ba41d5a
Show file tree
Hide file tree
Showing 14 changed files with 24 additions and 24 deletions.
6 changes: 3 additions & 3 deletions bazel/google_cloud_cpp_deps.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ci/cloudbuild/dockerfiles/demo-centos-7.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion ci/cloudbuild/dockerfiles/demo-debian-buster.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion ci/cloudbuild/dockerfiles/demo-debian-stretch.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion ci/cloudbuild/dockerfiles/demo-fedora.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion ci/cloudbuild/dockerfiles/demo-opensuse-leap.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion ci/cloudbuild/dockerfiles/demo-rockylinux-8.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion ci/cloudbuild/dockerfiles/demo-ubuntu-bionic.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion ci/cloudbuild/dockerfiles/demo-ubuntu-focal.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion ci/cloudbuild/dockerfiles/demo-ubuntu-xenial.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion ci/cloudbuild/dockerfiles/fedora-34.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion ci/cloudbuild/dockerfiles/ubuntu-bionic-install.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion ci/cloudbuild/dockerfiles/ubuntu-xenial.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
18 changes: 9 additions & 9 deletions doc/packaging.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down

0 comments on commit ba41d5a

Please sign in to comment.