From 966734f55bc4df015b5283d1a1db10a26126e901 Mon Sep 17 00:00:00 2001 From: Baodi Shi Date: Mon, 27 Nov 2023 09:00:47 +0800 Subject: [PATCH] Bump cpp client version to 3.4.1 --- pkg/mac/build-cpp-deps-lib.sh | 9 +++++---- pulsar-client-cpp.txt | 4 ++-- tests/consumer.test.js | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pkg/mac/build-cpp-deps-lib.sh b/pkg/mac/build-cpp-deps-lib.sh index e2078d12..5e73f02b 100755 --- a/pkg/mac/build-cpp-deps-lib.sh +++ b/pkg/mac/build-cpp-deps-lib.sh @@ -105,10 +105,11 @@ if [ ! -f protobuf-${PROTOBUF_VERSION}.done ]; then curl -O -L https://github.com/google/protobuf/releases/download/v${PROTOBUF_VERSION}/protobuf-cpp-${PROTOBUF_VERSION}.tar.gz tar xfz protobuf-cpp-${PROTOBUF_VERSION}.tar.gz pushd protobuf-${PROTOBUF_VERSION} - CXXFLAGS="-fPIC -arch arm64 -arch x86_64 -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}" \ - ./configure --prefix=$PREFIX - make -j16 V=1 - make install + pushd cmake/ + cmake -B build -DCMAKE_CXX_FLAGS="-fPIC -arch arm64 -arch x86_64 -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}" \ + -DCMAKE_INSTALL_PREFIX=$PREFIX + cmake --build build -j16 --target install + popd popd pushd install/lib diff --git a/pulsar-client-cpp.txt b/pulsar-client-cpp.txt index 5bb7214e..2d99b9ed 100644 --- 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 diff --git a/tests/consumer.test.js b/tests/consumer.test.js index 18c955c9..9e1be707 100644 --- a/tests/consumer.test.js +++ b/tests/consumer.test.js @@ -137,7 +137,7 @@ const Pulsar = require('../index'); await expect(consumer.close()).resolves.toEqual(null); - await expect(consumer.close()).rejects.toThrow('Failed to close consumer: AlreadyClosed'); + await expect(consumer.close()).resolves.toEqual(null); }); });