This is an automated email from the ASF dual-hosted git repository.
shibd pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/pulsar-client-cpp.git
The following commit(s) were added to refs/heads/main by this push:
new 0378140 Fix release workflows (#586)
0378140 is described below
commit 0378140ec177ce0829d9d3e92390c5bfe7f35437
Author: Yunze Xu <[email protected]>
AuthorDate: Tue Jun 2 10:33:46 2026 +0800
Fix release workflows (#586)
---
.github/workflows/ci-build-binary-artifacts.yaml | 27 ++++++++++++++++++------
build-support/download-release-artifacts.py | 2 +-
pkg/apk/docker-build-apk-arm64.sh | 2 ++
pkg/apk/docker-build-apk-x86_64.sh | 2 ++
pkg/deb/docker-build-deb-arm64.sh | 2 ++
pkg/deb/docker-build-deb-x86_64.sh | 2 ++
pkg/rpm/docker-build-rpm-arm64.sh | 2 ++
pkg/rpm/docker-build-rpm-x86_64.sh | 2 ++
8 files changed, 33 insertions(+), 8 deletions(-)
diff --git a/.github/workflows/ci-build-binary-artifacts.yaml
b/.github/workflows/ci-build-binary-artifacts.yaml
index d526063..660e924 100644
--- a/.github/workflows/ci-build-binary-artifacts.yaml
+++ b/.github/workflows/ci-build-binary-artifacts.yaml
@@ -31,7 +31,7 @@ jobs:
package-linux:
name: Build ${{matrix.pkg.name}} ${{matrix.cpu.platform}}
- runs-on: ubuntu-22.04
+ runs-on: ${{matrix.cpu.runner}}
timeout-minutes: 500
strategy:
@@ -42,15 +42,20 @@ jobs:
- { name: 'Deb', type: 'deb', path: 'pkg/deb/BUILD/DEB' }
- { name: 'Alpine', type: 'apk', path: 'pkg/apk/build' }
cpu:
- - { arch: 'x86_64', platform: 'x86_64' }
- - { arch: 'aarch64', platform: 'arm64' }
+ - { arch: 'x86_64', platform: 'x86_64', runner: 'ubuntu-22.04' }
+ - { arch: 'aarch64', platform: 'arm64', runner: 'ubuntu-22.04-arm' }
steps:
- name: checkout
uses: actions/checkout@v3
- - name: Set up QEMU
- uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a
+ - name: Restore vcpkg binary cache
+ uses: actions/cache@v4
+ with:
+ path: ~/.cache/vcpkg/archives
+ key:
vcpkg-linux-${{matrix.pkg.type}}-${{matrix.cpu.platform}}-${{hashFiles('vcpkg.json')}}
+ restore-keys: |
+ vcpkg-linux-${{matrix.pkg.type}}-${{matrix.cpu.platform}}-
- name: Package Pulsar source
run: build-support/generate-source-archive.sh
@@ -65,8 +70,8 @@ jobs:
tags: build:latest
platforms: linux/${{matrix.cpu.platform}}
build-args: PLATFORM=${{matrix.cpu.arch}}
- cache-from: type=gha
- cache-to: type=gha,mode=max
+ cache-from:
type=gha,scope=${{matrix.pkg.type}}-${{matrix.cpu.platform}}
+ cache-to:
type=gha,mode=max,scope=${{matrix.pkg.type}}-${{matrix.cpu.platform}}
- name: Build packages
run:
pkg/${{matrix.pkg.type}}/docker-build-${{matrix.pkg.type}}-${{matrix.cpu.platform}}.sh
build:latest
@@ -211,6 +216,14 @@ jobs:
fetch-depth: 0
submodules: recursive
+ - name: Restore vcpkg binary cache
+ uses: actions/cache@v4
+ with:
+ path: ~/Library/Caches/vcpkg/archives
+ key: vcpkg-macos-${{ matrix.arch }}-${{ hashFiles('vcpkg.json') }}
+ restore-keys: |
+ vcpkg-macos-${{ matrix.arch }}-
+
- name: Install dependencies
run: |
export ARCH=${{ matrix.arch }}
diff --git a/build-support/download-release-artifacts.py
b/build-support/download-release-artifacts.py
index 9b1866f..8ccd0f8 100755
--- a/build-support/download-release-artifacts.py
+++ b/build-support/download-release-artifacts.py
@@ -47,7 +47,7 @@ with requests.get(workflow_run_url, headers=headers) as
response:
for artifact in data['artifacts']:
name = artifact['name']
# Skip debug artifact
- if name.endswith("-Debug"):
+ if name.endswith("-Debug") or name.find("dockerbuild") >= 0:
continue
dest_dir = os.path.join(dest_path, name)
if name.find("windows") >= 0 and os.path.exists(dest_dir + ".tar.gz"):
diff --git a/pkg/apk/docker-build-apk-arm64.sh
b/pkg/apk/docker-build-apk-arm64.sh
index 8480ee5..39c756f 100755
--- a/pkg/apk/docker-build-apk-arm64.sh
+++ b/pkg/apk/docker-build-apk-arm64.sh
@@ -24,7 +24,9 @@ ROOT_DIR=$(git rev-parse --show-toplevel)
IMAGE_NAME=${1:-apachepulsar/pulsar-build:alpine-3.16-arm64}
+mkdir -p $HOME/.cache/vcpkg/archives
docker run -v $ROOT_DIR:/pulsar-client-cpp \
+ -v $HOME/.cache/vcpkg/archives:/root/.cache/vcpkg/archives \
--env PLATFORM=aarch64 \
$IMAGE_NAME \
/pulsar-client-cpp/pkg/apk/build-apk.sh
diff --git a/pkg/apk/docker-build-apk-x86_64.sh
b/pkg/apk/docker-build-apk-x86_64.sh
index 985d87d..ccf99d7 100755
--- a/pkg/apk/docker-build-apk-x86_64.sh
+++ b/pkg/apk/docker-build-apk-x86_64.sh
@@ -24,7 +24,9 @@ ROOT_DIR=$(git rev-parse --show-toplevel)
IMAGE_NAME=${1:-apachepulsar/pulsar-build:alpine-3.16-x86_64}
+mkdir -p $HOME/.cache/vcpkg/archives
docker run -v $ROOT_DIR:/pulsar-client-cpp \
+ -v $HOME/.cache/vcpkg/archives:/root/.cache/vcpkg/archives \
--env PLATFORM=x86_64 \
$IMAGE_NAME \
/pulsar-client-cpp/pkg/apk/build-apk.sh
diff --git a/pkg/deb/docker-build-deb-arm64.sh
b/pkg/deb/docker-build-deb-arm64.sh
index 99dced2..56be961 100755
--- a/pkg/deb/docker-build-deb-arm64.sh
+++ b/pkg/deb/docker-build-deb-arm64.sh
@@ -24,7 +24,9 @@ ROOT_DIR=$(git rev-parse --show-toplevel)
IMAGE_NAME=${1:-apachepulsar/pulsar-build:debian-9-2.11-arm64}
+mkdir -p $HOME/.cache/vcpkg/archives
docker run -v $ROOT_DIR:/pulsar-client-cpp \
+ -v $HOME/.cache/vcpkg/archives:/root/.cache/vcpkg/archives \
--env PLATFORM=arm64 \
$IMAGE_NAME \
/pulsar-client-cpp/pkg/deb/build-deb.sh \
diff --git a/pkg/deb/docker-build-deb-x86_64.sh
b/pkg/deb/docker-build-deb-x86_64.sh
index 7537696..eace14a 100755
--- a/pkg/deb/docker-build-deb-x86_64.sh
+++ b/pkg/deb/docker-build-deb-x86_64.sh
@@ -24,7 +24,9 @@ ROOT_DIR=$(git rev-parse --show-toplevel)
IMAGE_NAME=${1:-apachepulsar/pulsar-build:debian-9-2.11-x86_64}
+mkdir -p $HOME/.cache/vcpkg/archives
docker run -v $ROOT_DIR:/pulsar-client-cpp \
+ -v $HOME/.cache/vcpkg/archives:/root/.cache/vcpkg/archives \
--env PLATFORM=amd64 \
$IMAGE_NAME \
/pulsar-client-cpp/pkg/deb/build-deb.sh \
diff --git a/pkg/rpm/docker-build-rpm-arm64.sh
b/pkg/rpm/docker-build-rpm-arm64.sh
index 13ca8d5..5021974 100755
--- a/pkg/rpm/docker-build-rpm-arm64.sh
+++ b/pkg/rpm/docker-build-rpm-arm64.sh
@@ -24,7 +24,9 @@ ROOT_DIR=$(git rev-parse --show-toplevel)
IMAGE_NAME=${1:-apachepulsar/pulsar-build:centos-7-2.11-arm64}
+mkdir -p $HOME/.cache/vcpkg/archives
docker run -v $ROOT_DIR:/pulsar-client-cpp \
+ -v $HOME/.cache/vcpkg/archives:/root/.cache/vcpkg/archives \
--env PLATFORM=aarch64 \
$IMAGE_NAME \
/pulsar-client-cpp/pkg/rpm/build-rpm.sh
diff --git a/pkg/rpm/docker-build-rpm-x86_64.sh
b/pkg/rpm/docker-build-rpm-x86_64.sh
index c78dc7b..1282c22 100755
--- a/pkg/rpm/docker-build-rpm-x86_64.sh
+++ b/pkg/rpm/docker-build-rpm-x86_64.sh
@@ -24,7 +24,9 @@ ROOT_DIR=$(git rev-parse --show-toplevel)
IMAGE_NAME=${1:-apachepulsar/pulsar-build:centos-7-2.11-x86_64}
+mkdir -p $HOME/.cache/vcpkg/archives
docker run -v $ROOT_DIR:/pulsar-client-cpp \
+ -v $HOME/.cache/vcpkg/archives:/root/.cache/vcpkg/archives \
--env PLATFORM=x86_64 \
$IMAGE_NAME \
/pulsar-client-cpp/pkg/rpm/build-rpm.sh
