From 95553b5d64d50bd42624bdff48bd7cf18c92a53d Mon Sep 17 00:00:00 2001
From: Matteo Merli <mmerli@apache.org>
Date: Fri, 28 Oct 2022 12:19:56 -0400
Subject: [PATCH 1/2] Fetch C++ client official release

---
 build-support/install-cpp-client.sh | 3 +--
 pkg/mac/build-pulsar-cpp.sh         | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/build-support/install-cpp-client.sh b/build-support/install-cpp-client.sh
index 4c4608fa..707d3a6e 100755
--- a/build-support/install-cpp-client.sh
+++ b/build-support/install-cpp-client.sh
@@ -33,8 +33,7 @@ export $(cat /etc/*-release | grep "^ID=")
 cd /tmp
 
 # Fetch the client binaries
-## TODO: Fetch from official release once it's available
-BASE_URL=https://dist.apache.org/repos/dist/dev/pulsar/pulsar-client-cpp-${CPP_CLIENT_VERSION}-candidate-2
+BASE_URL=https://dist.apache.org/repos/dist/release/pulsar/pulsar-client-cpp-${CPP_CLIENT_VERSION}
 
 UNAME_ARCH=$(uname -m)
 if [ $UNAME_ARCH == 'aarch64' ]; then
diff --git a/pkg/mac/build-pulsar-cpp.sh b/pkg/mac/build-pulsar-cpp.sh
index ccf7eb46..cf715451 100755
--- a/pkg/mac/build-pulsar-cpp.sh
+++ b/pkg/mac/build-pulsar-cpp.sh
@@ -37,8 +37,7 @@ DEPS_PREFIX=${CACHE_DIR_DEPS}/install
 
 ###############################################################################
 
-## TODO: Fetch from official release
-curl -O -L https://dist.apache.org/repos/dist/dev/pulsar/pulsar-client-cpp-${PULSAR_CPP_VERSION}-candidate-2/apache-pulsar-client-cpp-${PULSAR_CPP_VERSION}.tar.gz
+curl -O -L https://dist.apache.org/repos/dist/release/pulsar/pulsar-client-cpp-${PULSAR_CPP_VERSION}/apache-pulsar-client-cpp-${PULSAR_CPP_VERSION}.tar.gz
 tar xfz apache-pulsar-client-cpp-${PULSAR_CPP_VERSION}.tar.gz
 
 if [ ! -f apache-pulsar-client-cpp-${PULSAR_CPP_VERSION}/.done ]; then

From 03181f7ad09b93f758c9884b734a1aa53aec79e3 Mon Sep 17 00:00:00 2001
From: Matteo Merli <mmerli@apache.org>
Date: Sat, 29 Oct 2022 09:57:58 -0700
Subject: [PATCH 2/2] Fixed APK URL

---
 build-support/install-cpp-client.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build-support/install-cpp-client.sh b/build-support/install-cpp-client.sh
index 707d3a6e..fcc56f92 100755
--- a/build-support/install-cpp-client.sh
+++ b/build-support/install-cpp-client.sh
@@ -48,8 +48,8 @@ if [ $ID == 'ubuntu' ]; then
   $SUDO apt install -y /tmp/*.deb
 
 elif [ $ID == 'alpine' ]; then
-  curl -L -O ${BASE_URL}/apk-${PLATFORM}/apache-pulsar-client-${CPP_CLIENT_VERSION}-r0.apk
-  curl -L -O ${BASE_URL}/apk-${PLATFORM}/apache-pulsar-client-dev-${CPP_CLIENT_VERSION}-r0.apk
+  curl -L -O ${BASE_URL}/apk-${PLATFORM}/${UNAME_ARCH}/apache-pulsar-client-${CPP_CLIENT_VERSION}-r0.apk
+  curl -L -O ${BASE_URL}/apk-${PLATFORM}/${UNAME_ARCH}/apache-pulsar-client-dev-${CPP_CLIENT_VERSION}-r0.apk
   $SUDO apk add --allow-untrusted /tmp/*.apk
 
 elif [ $ID == '"centos"' ]; then