upgrade grpc from v1.14.2 to v1.24.3 (protobuf from v3.5.1 to v3.8.0)

pingcap · Dec 26, 2019 · fbaa013 · fbaa013
1 parent 31d470f
commit fbaa013
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/docker/builder/Dockerfile b/docker/builder/Dockerfile
@@ -15,7 +15,7 @@ RUN apt update -y \
  && pip3 install pybind11 pyinstaller dnspython uri requests urllib3 toml setuptools \
  && rm -rf /var/lib/apt/lists/*
 
-RUN git clone https://github.com/grpc/grpc.git && cd grpc && git checkout v1.14.2 && git submodule update --init \
+RUN git clone https://github.com/grpc/grpc.git && cd grpc && git checkout v1.24.3 && git submodule update --init \
  && cd /grpc && mkdir .build && cd .build && cmake .. -DgRPC_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=Release && make install -j $(nproc || grep -c ^processor /proc/cpuinfo) \
  && rm -rf /grpc/.build \
  && cd /grpc && mkdir .build && cd .build && cmake .. -DgRPC_INSTALL=ON -DgRPC_BUILD_TESTS=OFF -DgRPC_PROTOBUF_PROVIDER=package -DgRPC_ZLIB_PROVIDER=package -DgRPC_CARES_PROVIDER=package -DgRPC_SSL_PROVIDER=package -DCMAKE_BUILD_TYPE=Release && make install -j $(nproc || grep -c ^processor /proc/cpuinfo) \
@@ -28,5 +28,3 @@ RUN git clone https://github.com/grpc/grpc.git && cd grpc && git checkout v1.14.
  && ./release.sh \
  && rm -rf /flash_cluster_manager && cp -r dist/flash_cluster_manager/ /flash_cluster_manager \
  && cd / && rm -rf tics-build/
-
-
diff --git a/release-centos7/prepare-environments/install-grpc.sh b/release-centos7/prepare-environments/install-grpc.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-VERSION="v1.14.2"
+VERSION="v1.24.3"
 THREADS=$(nproc || grep -c ^processor /proc/cpuinfo)
 
 cd ~
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ @@
     set -e
-    VERSION="v1.14.2"
+    VERSION="v1.24.3"
     THREADS=$(nproc || grep -c ^processor /proc/cpuinfo)
     cd ~
@@ Expand Down @@