From aa7050614e983c9458d0e575ff143a4c086355dc Mon Sep 17 00:00:00 2001 From: Zike Yang Date: Thu, 8 Sep 2022 14:40:51 +0800 Subject: [PATCH 1/3] [improve][build] Create images before build python wheels --- pulsar-client-cpp/docker/build-wheels.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pulsar-client-cpp/docker/build-wheels.sh b/pulsar-client-cpp/docker/build-wheels.sh index 25ac64f4846ec..5e2d4cfe91a68 100755 --- a/pulsar-client-cpp/docker/build-wheels.sh +++ b/pulsar-client-cpp/docker/build-wheels.sh @@ -27,6 +27,8 @@ BUILD_IMAGE_NAME="${BUILD_IMAGE_NAME:-apachepulsar/pulsar-build}" ROOT_DIR=`cd $(dirname $0)/../..; pwd` cd $ROOT_DIR +./pulsar-client-cpp/docker/create-images.sh + source ./pulsar-client-cpp/docker/python-versions.sh function contains_build_version { From 250c882a9ef61278e0a565ba2a354e8e0b65fbc8 Mon Sep 17 00:00:00 2001 From: Zike Yang Date: Wed, 14 Sep 2022 16:06:23 +0800 Subject: [PATCH 2/3] Add option to skip create images. --- pulsar-client-cpp/docker/build-wheels.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pulsar-client-cpp/docker/build-wheels.sh b/pulsar-client-cpp/docker/build-wheels.sh index 5e2d4cfe91a68..46852f226604f 100755 --- a/pulsar-client-cpp/docker/build-wheels.sh +++ b/pulsar-client-cpp/docker/build-wheels.sh @@ -27,7 +27,17 @@ BUILD_IMAGE_NAME="${BUILD_IMAGE_NAME:-apachepulsar/pulsar-build}" ROOT_DIR=`cd $(dirname $0)/../..; pwd` cd $ROOT_DIR -./pulsar-client-cpp/docker/create-images.sh +skip_create_images=0 +while [[ "$1" == "--skip-create-images" ]]; do + skip_create_images=1 + shift +done + +if [ $skip_create_images -ne 1 ]; then + cd ./pulsar-client-cpp/docker + ./create-images.sh + pushd +fi source ./pulsar-client-cpp/docker/python-versions.sh From 527e5900eda41906de2a94e34d2d354bc871b1be Mon Sep 17 00:00:00 2001 From: Zike Yang Date: Wed, 28 Sep 2022 09:33:38 +0800 Subject: [PATCH 3/3] Update pulsar-client-cpp/docker/build-wheels.sh Co-authored-by: Yunze Xu --- pulsar-client-cpp/docker/build-wheels.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pulsar-client-cpp/docker/build-wheels.sh b/pulsar-client-cpp/docker/build-wheels.sh index 46852f226604f..be655439fa325 100755 --- a/pulsar-client-cpp/docker/build-wheels.sh +++ b/pulsar-client-cpp/docker/build-wheels.sh @@ -34,9 +34,9 @@ while [[ "$1" == "--skip-create-images" ]]; do done if [ $skip_create_images -ne 1 ]; then - cd ./pulsar-client-cpp/docker + pushd ./pulsar-client-cpp/docker ./create-images.sh - pushd + popd fi source ./pulsar-client-cpp/docker/python-versions.sh