Bump cpp client version to 3.4.1

shibd · Nov 27, 2023 · b456009 · b456009
1 parent 801e5ce
commit b456009
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 332 deletions.
diff --git a/.github/workflows/ci-build-release-napi.yml b/.github/workflows/ci-build-release-napi.yml
@@ -71,20 +71,10 @@ jobs:
             echo "ARCH=${{ matrix.arch }}" >> $GITHUB_ENV
           fi
 
-      - name: Build CPP dependencies lib
-        if: steps.cache-dependencies.outputs.cache-hit != 'true'
-        run: |
-          export ARCH=${{ env.ARCH }}
-          pkg/mac/build-cpp-deps-lib.sh
-
-      - name: Build CPP lib
-        if: steps.cache-pulsar.outputs.cache-hit != 'true'
-        run: |
-          export ARCH=${{ env.ARCH }}
-          pkg/mac/build-cpp-lib.sh
-
       - name: Build Node binaries lib
         run: |
+          export ARCH=${{ env.ARCH }}
+          pkg/mac/download-cpp-client.sh
           npm install --ignore-scripts
           npx node-pre-gyp configure --target_arch=${{ matrix.arch }}
           npx node-pre-gyp build --target_arch=${{ matrix.arch }}

diff --git a/.github/workflows/ci-pr-validation.yml b/.github/workflows/ci-pr-validation.yml
@@ -98,13 +98,6 @@ jobs:
         with:
           python-version: ${{ matrix.python }}
 
-      - name: Cache Dependencies
-        id: cache-dependencies
-        uses: actions/cache@v3
-        with:
-          path: pkg/mac/build
-          key: ${{ runner.os }}-${{ matrix.arch }}-mac-${{ hashFiles('pkg/mac/build-cpp-deps-lib.sh') }}
-
       - name: Add arch env vars
         run: |
           if [ "${{ matrix.arch }}" = "x64" ]; then
@@ -113,20 +106,10 @@ jobs:
             echo "ARCH=${{ matrix.arch }}" >> $GITHUB_ENV
           fi
 
-      - name: Build CPP dependencies lib
-        if: steps.cache-dependencies.outputs.cache-hit != 'true'
-        run: |
-          export ARCH=${{ env.ARCH }}
-          pkg/mac/build-cpp-deps-lib.sh
-
-      - name: Build CPP lib
-        if: steps.cache-pulsar.outputs.cache-hit != 'true'
-        run: |
-          export ARCH=${{ env.ARCH }}
-          pkg/mac/build-cpp-lib.sh
-
       - name: Build Node binaries lib
         run: |
+          export ARCH=${{ env.ARCH }}
+          pkg/mac/download-cpp-client.sh
           npm install --ignore-scripts
           npx node-pre-gyp configure --target_arch=${{ matrix.arch }}
           npx node-pre-gyp build --target_arch=${{ matrix.arch }}

diff --git a/build-support/dep-version.py b/build-support/dep-version.py
diff --git a/dependencies.yaml b/dependencies.yaml
diff --git a/pkg/mac/build-cpp-deps-lib.sh b/pkg/mac/build-cpp-deps-lib.sh
diff --git a/pkg/mac/build-cpp-lib.sh b/pkg/mac/build-cpp-lib.sh
diff --git a/pkg/mac/common.sh → pkg/mac/download-cpp-client.sh b/pkg/mac/common.sh → pkg/mac/download-cpp-client.sh
@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
@@ -19,19 +20,21 @@
 
 set -e -x
 
+ROOT_DIR=`cd $(dirname $0) && cd ../../ && pwd`
+source $ROOT_DIR/pulsar-client-cpp.txt
+
+if [ $USER != "root" ]; then
+  SUDO="sudo"
+fi
+
 if [ -z "$ARCH" ]; then
    export ARCH=$(uname -m)
 fi
 
-export MACOSX_DEPLOYMENT_TARGET=11.0
-
-MAC_BUILD_DIR=`cd $(dirname $0); pwd`
-ROOT_DIR=$(git rev-parse --show-toplevel)
-source $ROOT_DIR/pulsar-client-cpp.txt
-
-cd $MAC_BUILD_DIR
-mkdir -p build
-cd build
-mkdir -p install
-export PREFIX=`pwd`/install
+rm -rf $ROOT_DIR/pkg/mac/build-pulsar
+mkdir -p $ROOT_DIR/pkg/mac/build-pulsar/install
+cd $ROOT_DIR/pkg/mac
+curl -L -O ${CPP_CLIENT_BASE_URL}/macos-${ARCH}.zip
+unzip -d $ROOT_DIR/pkg/mac/build-pulsar/install macos-${ARCH}.zip
+rm -rf macos-${ARCH}.zip
 
diff --git a/pulsar-client-cpp.txt b/pulsar-client-cpp.txt
@@ -1,2 +1,2 @@
-CPP_CLIENT_BASE_URL=https://archive.apache.org/dist/pulsar/pulsar-client-cpp-3.2.0
-CPP_CLIENT_VERSION=3.2.0
+CPP_CLIENT_BASE_URL=https://archive.apache.org/dist/pulsar/pulsar-client-cpp-3.4.1
+CPP_CLIENT_VERSION=3.4.1