Skip to content

Commit 0ca283e

Browse files
Klug, StefanKlug, Stefan
Klug, Stefan
authored and
Klug, Stefan
committed
Merged PR 8730: Fall back to qemu based builds for armv7l
2 parents b59c3b9 + e7b6330 commit 0ca283e

File tree

2 files changed

+14
-11
lines changed

2 files changed

+14
-11
lines changed

.travis.yml

+13-11
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,18 @@ jobs:
6060
- arch: amd64
6161
env: P=linux_i686 A=cp38
6262
# linux_armv7l
63-
- arch: arm64
64-
env: P=linux_armv7l A=cp34m
65-
- arch: arm64
66-
env: P=linux_armv7l A=cp35m
67-
- arch: arm64
68-
env: P=linux_armv7l A=cp36m
69-
- arch: arm64
70-
env: P=linux_armv7l A=cp37m
71-
- arch: arm64
72-
env: P=linux_armv7l A=cp38
63+
# armv7l is still build using qemu on x86, because it was not easily possible to build for armv7l (The best was armv8l using linux32 wrapper)
64+
# The tests are disabled for armv7l because installing the required numpy took too long and we hit the maximum allowed travis build time.
65+
- arch: amd64
66+
env: P=linux_armv7l A=cp34m ARGS="--disable-tests"
67+
- arch: amd64
68+
env: P=linux_armv7l A=cp35m ARGS="--disable-tests"
69+
- arch: amd64
70+
env: P=linux_armv7l A=cp36m ARGS="--disable-tests"
71+
- arch: amd64
72+
env: P=linux_armv7l A=cp37m ARGS="--disable-tests"
73+
- arch: amd64
74+
env: P=linux_armv7l A=cp38 ARGS="--disable-tests"
7375
# linux_aarch64
7476
- arch: arm64
7577
env: P=linux_aarch64 A=cp34m
@@ -120,7 +122,7 @@ script:
120122
if [ "$TRAVIS_CPU_ARCH" == "amd64" ]; then
121123
docker run --rm --privileged multiarch/qemu-user-static:register --reset
122124
fi
123-
- "./scripts/build/build-arch.sh --platform-tag $P --abi-tag $A --pylon-dir ./pylon_installer"
125+
- "./scripts/build/build-arch.sh --platform-tag $P --abi-tag $A --pylon-dir ./pylon_installer $ARGS"
124126

125127
deploy:
126128
provider: releases

changelog.txt

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Version 1.6.0
44
- Fixed unittests that failed in python 3.8
55
- Updated to current pylon version for windows and linux
66
- Enabled unittests in CI-builds
7+
- Fixed aarch64 binary wheel releases on github
78

89
Version 1.5.4
910
- Date 2020-04-16

0 commit comments

Comments
 (0)