Skip to content

Commit bf0ac46

Browse files
committed
Merge bitcoin#930: Add ARM32/ARM64 CI
8bbad7a Add asm build to ARM32 CI (Pieter Wuille) 7d65ed5 Add ARM32/ARM64 CI (Pieter Wuille) Pull request description: ACKs for top commit: real-or-random: ACK 8bbad7a CI output looks fine jonasnick: ACK 8bbad7a Tree-SHA512: 090a52af6914cf9fb659f9626a8224d82c8da81f6e628b7300e34851e198d8299dfd25789c0f1d6f2c79f58b5413be498f9fba43bc50238480fe6524b640538a
2 parents 202a030 + 8bbad7a commit bf0ac46

File tree

2 files changed

+49
-0
lines changed

2 files changed

+49
-0
lines changed

.cirrus.yml

+45
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,51 @@ task:
197197
- ./ci/cirrus.sh
198198
<< : *CAT_LOGS
199199

200+
task:
201+
name: "ARM32: Linux (Debian stable, QEMU)"
202+
container:
203+
dockerfile: ci/linux-debian.Dockerfile
204+
cpu: 1
205+
memory: 1G
206+
env:
207+
QEMU_CMD: qemu-arm
208+
HOST: arm-linux-gnueabihf
209+
BUILD:
210+
WITH_VALGRIND: no
211+
ECDH: yes
212+
RECOVERY: yes
213+
EXPERIMENTAL: yes
214+
SCHNORRSIG: yes
215+
CTIMETEST: no
216+
matrix:
217+
- env: {}
218+
- env: {ASM: arm}
219+
<< : *MERGE_BASE
220+
test_script:
221+
- ./ci/cirrus.sh
222+
<< : *CAT_LOGS
223+
224+
task:
225+
name: "ARM64: Linux (Debian stable, QEMU)"
226+
container:
227+
dockerfile: ci/linux-debian.Dockerfile
228+
cpu: 1
229+
memory: 1G
230+
env:
231+
QEMU_CMD: qemu-aarch64
232+
HOST: aarch64-linux-gnu
233+
BUILD:
234+
WITH_VALGRIND: no
235+
ECDH: yes
236+
RECOVERY: yes
237+
EXPERIMENTAL: yes
238+
SCHNORRSIG: yes
239+
CTIMETEST: no
240+
<< : *MERGE_BASE
241+
test_script:
242+
- ./ci/cirrus.sh
243+
<< : *CAT_LOGS
244+
200245
task:
201246
name: "x86_64 (mingw32-w64): Windows (Debian stable, Wine)"
202247
container:

ci/linux-debian.Dockerfile

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ FROM debian:stable
22

33
RUN dpkg --add-architecture i386
44
RUN dpkg --add-architecture s390x
5+
RUN dpkg --add-architecture armhf
6+
RUN dpkg --add-architecture arm64
57
RUN apt-get update
68

79
# dkpg-dev: to make pkg-config work in cross-builds
@@ -11,6 +13,8 @@ RUN apt-get install --no-install-recommends --no-upgrade -y \
1113
gcc clang libc6-dbg \
1214
gcc-i686-linux-gnu libc6-dev-i386-cross libc6-dbg:i386 \
1315
gcc-s390x-linux-gnu libc6-dev-s390x-cross libc6-dbg:s390x \
16+
gcc-arm-linux-gnueabihf libc6-dev-armhf-cross libc6-dbg:armhf \
17+
gcc-aarch64-linux-gnu libc6-dev-arm64-cross libc6-dbg:arm64 \
1418
wine gcc-mingw-w64-x86-64
1519

1620
# Run a dummy command in wine to make it set up configuration

0 commit comments

Comments
 (0)