diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2018-11-07 08:49:35 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-11-07 08:49:35 +0100 |
| commit | 35e1f9fa6a318dac3fe232d99a5a41768f12197f (patch) | |
| tree | 21fc378223bcba030ac187cd15848cfbfe80c063 | |
| parent | 269493f9e85fde18d04a0851eae9886b3aad7c74 (diff) | |
| parent | dff13fe1a947de8ff57b3679d476a50a3b5a2d3b (diff) | |
Merge pull request #17121 from jtattermusch/speedup_interop_builds
Speedup interop builds (PHP and C++)
3 files changed, 13 insertions, 11 deletions
diff --git a/tools/dockerfile/interoptest/grpc_interop_cxx/build_interop.sh b/tools/dockerfile/interoptest/grpc_interop_cxx/build_interop.sh index fd549fb9e5..8b8c6be8f1 100755 --- a/tools/dockerfile/interoptest/grpc_interop_cxx/build_interop.sh +++ b/tools/dockerfile/interoptest/grpc_interop_cxx/build_interop.sh @@ -28,10 +28,10 @@ cp -r /var/local/jenkins/service_account $HOME || true cd /var/local/git/grpc -make install-certs +make install-certs -j4 # build C++ interop client & server -make interop_client interop_server -j2 +make interop_client interop_server -j4 # build C++ http2 client -make http2_client +make http2_client -j4 diff --git a/tools/dockerfile/interoptest/grpc_interop_php/build_interop.sh b/tools/dockerfile/interoptest/grpc_interop_php/build_interop.sh index 999976d15d..fc5c22083a 100755 --- a/tools/dockerfile/interoptest/grpc_interop_php/build_interop.sh +++ b/tools/dockerfile/interoptest/grpc_interop_php/build_interop.sh @@ -28,12 +28,13 @@ cp -r /var/local/jenkins/service_account $HOME || true cd /var/local/git/grpc -# gRPC core and protobuf need to be installed -make install +# Install gRPC C core and build codegen plugins +make -j4 install_c plugins -(cd src/php/ext/grpc && phpize && ./configure && make) +(cd src/php/ext/grpc && phpize && ./configure && make -j4) -(cd third_party/protobuf && make install) +# Install protobuf (need access to protoc) +(cd third_party/protobuf && make -j4 install) (cd src/php && php -d extension=ext/grpc/modules/grpc.so /usr/local/bin/composer install) diff --git a/tools/dockerfile/interoptest/grpc_interop_php7/build_interop.sh b/tools/dockerfile/interoptest/grpc_interop_php7/build_interop.sh index efa97530c8..248a8f680b 100755 --- a/tools/dockerfile/interoptest/grpc_interop_php7/build_interop.sh +++ b/tools/dockerfile/interoptest/grpc_interop_php7/build_interop.sh @@ -28,12 +28,13 @@ cp -r /var/local/jenkins/service_account $HOME || true cd /var/local/git/grpc -# gRPC core and protobuf need to be installed -make install +# Install gRPC C core and build codegen plugins +make -j4 install_c plugins -(cd src/php/ext/grpc && phpize && ./configure && make) +(cd src/php/ext/grpc && phpize && ./configure && make -j4) -(cd third_party/protobuf && make install) +# Install protobuf (need access to protoc) +(cd third_party/protobuf && make -j4 install) (cd src/php && php -d extension=ext/grpc/modules/grpc.so /usr/local/bin/composer install) |