Skip to content

Commit 03fe428

Browse files
Fix aarch64 build on Alpine (#558)
* Fix aarch64 build on Alpine * fix workflow not run
1 parent fcde485 commit 03fe428

File tree

4 files changed

+12
-6
lines changed

4 files changed

+12
-6
lines changed

.github/workflows/ci-build-binary-artifacts.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,15 @@ jobs:
5050
uses: actions/checkout@v3
5151

5252
- name: Set up QEMU
53-
uses: docker/setup-qemu-action@v2
53+
uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a
5454

5555
- name: Package Pulsar source
5656
run: build-support/generate-source-archive.sh
5757

58-
- uses: docker/setup-buildx-action@v2
58+
- uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd
5959

6060
- name: Build dependencies Docker image
61-
uses: docker/build-push-action@v3
61+
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294
6262
with:
6363
context: ./pkg/${{matrix.pkg.type}}
6464
load: true

.github/workflows/ci-pr-validation.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -357,15 +357,15 @@ jobs:
357357
uses: actions/checkout@v3
358358

359359
- name: Set up QEMU
360-
uses: docker/setup-qemu-action@v2
360+
uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a
361361

362362
- name: Package Pulsar source
363363
run: build-support/generate-source-archive.sh
364364

365-
- uses: docker/setup-buildx-action@v2
365+
- uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd
366366

367367
- name: Build dependencies Docker image
368-
uses: docker/build-push-action@v3
368+
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294
369369
with:
370370
context: ./pkg/${{matrix.pkg.type}}
371371
load: true

pkg/apk/APKBUILD

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,11 @@ build() {
4141
git clone https://github.com/microsoft/vcpkg.git
4242
mv vcpkg $ROOT_DIR/
4343
export VCPKG_FORCE_SYSTEM_BINARIES=1
44+
# On aarch64 musl, vcpkg has no prebuilt binary and builds from source.
45+
# The default bootstrap downloads old curl 7.29.0 headers that lack
46+
# target-independent curlbuild.h, failing on aarch64. Use system curl instead.
47+
sed -i 's/-DCMAKE_BUILD_TYPE=Release/-DVCPKG_LIBCURL_DLSYM=OFF -DCMAKE_BUILD_TYPE=Release/' \
48+
$ROOT_DIR/vcpkg/scripts/bootstrap.sh
4449
set +e
4550
cmake -B build -DINTEGRATE_VCPKG=ON -DCMAKE_BUILD_TYPE=Release \
4651
-DCMAKE_MAKE_PROGRAM=make \

pkg/apk/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ RUN apk add \
2828
abuild \
2929
bash \
3030
curl \
31+
curl-dev \
3132
g++ \
3233
make \
3334
cmake \

0 commit comments

Comments
 (0)