Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Dec 27, 2019
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbaa013
upgrade grpc from v1.14.2 to v1.24.3 (protobuf from v3.5.1 to v3.8.0)
marsishandsome Dec 25, 2019
1fc8378
Merge branch 'master' into feature/update-protobuf
marsishandsome Dec 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions docker/builder/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) \
Expand All @@ -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/


2 changes: 1 addition & 1 deletion release-centos7/prepare-environments/install-grpc.sh
View file
Open in desktop
Original file line number Diff 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