Skip to content

Commit 4b4e0fe

Browse files
committed
fixes #13080 -- test and build wheels for musl armv7l
1 parent 94fd118 commit 4b4e0fe

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@ jobs:
222222
IMAGE:
223223
- {IMAGE: "alpine", NOXSESSION: "tests", RUNNER: "ubuntu-latest"}
224224
- {IMAGE: "alpine:aarch64", NOXSESSION: "tests", RUNNER: "ubuntu-24.04-arm"}
225+
- {IMAGE: "alpine:armv7l", NOXSESSION: "tests", RUNNER: "ubuntu-24.04-arm"}
225226
timeout-minutes: 15
226227
env:
227228
RUSTUP_HOME: /root/.rustup
@@ -236,7 +237,7 @@ jobs:
236237
# then use a glibc nodejs, which works fine when gcompat
237238
# is installed in the container (which it is)
238239
sed -i "s:ID=alpine:ID=NotpineForGHA:" /etc/os-release
239-
if: matrix.IMAGE.IMAGE == 'alpine:aarch64'
240+
if: matrix.IMAGE.IMAGE == 'alpine:aarch64' || matrix.IMAGE.IMAGE == 'alpine:armv7l'
240241

241242
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
242243
timeout-minutes: 3

.github/workflows/wheel-builder.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ jobs:
8181
- { NAME: "musllinux_1_2_aarch64", CONTAINER: "cryptography-musllinux_1_2:aarch64", RUNNER: "ubuntu-24.04-arm" }
8282

8383
- { NAME: "manylinux_2_31_armv7l", CONTAINER: "cryptography-manylinux_2_31:armv7l", RUNNER: "ubuntu-24.04-arm" }
84+
- { NAME: "musllinux_1_2_armv7l", CONTAINER: "cryptography-musllinux_1_2:armv7l", RUNNER: "ubuntu-24.04-arm" }
8485
exclude:
8586
# There are no readily available musllinux PyPy distributions
8687
- PYTHON: { VERSION: "pp310-pypy310_pp73" }
@@ -107,6 +108,10 @@ jobs:
107108
MANYLINUX: { NAME: "manylinux_2_31_armv7l", CONTAINER: "cryptography-manylinux_2_31:armv7l", RUNNER: "ubuntu-24.04-arm" }
108109
- PYTHON: { VERSION: "pp311-pypy311_pp73" }
109110
MANYLINUX: { NAME: "manylinux_2_31_armv7l", CONTAINER: "cryptography-manylinux_2_31:armv7l", RUNNER: "ubuntu-24.04-arm" }
111+
- PYTHON: { VERSION: "pp310-pypy310_pp73" }
112+
MANYLINUX: { NAME: "musllinux_1_2_armv7l", CONTAINER: "cryptography-musllinux_1_2:armv7l", RUNNER: "ubuntu-24.04-arm" }
113+
- PYTHON: { VERSION: "pp311-pypy311_pp73" }
114+
MANYLINUX: { NAME: "musllinux_1_2_armv7l", CONTAINER: "cryptography-musllinux_1_2:armv7l", RUNNER: "ubuntu-24.04-arm" }
110115
name: "${{ matrix.PYTHON.VERSION }} for ${{ matrix.MANYLINUX.NAME }}"
111116
steps:
112117
- name: Ridiculous-er workaround for static node20

docs/installation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ operating systems.
3333
* ARMv7l Ubuntu rolling
3434
* x86-64 Debian Bullseye (11.x), Bookworm (12.x), Trixie (13.x), and
3535
Sid (unstable)
36-
* x86-64 and ARM64 Alpine (latest)
36+
* x86-64, ARM64, and ARMv7l Alpine (latest)
3737
* 32-bit and 64-bit Python on 64-bit Windows Server 2022
3838

3939
We test compiling with ``clang`` as well as ``gcc`` and use the following

0 commit comments

Comments
 (0)