Skip to content

Commit 1a0ba3e

Browse files
authored
preparations for musllinux (#6236)
* preparations for musllinux * wheel-builder | skip PyPy on musllinux builds
1 parent 0af8579 commit 1a0ba3e

1 file changed

Lines changed: 9 additions & 2 deletions

File tree

.github/workflows/wheel-builder.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,13 @@ jobs:
2121
- { NAME: "manylinux2010_x86_64", CONTAINER: "cryptography-manylinux2010:x86_64" }
2222
- { NAME: "manylinux2014_x86_64", CONTAINER: "cryptography-manylinux2014:x86_64" }
2323
- { name: "manylinux_2_24_x86_64", CONTAINER: "cryptography-manylinux_2_24:x86_64"}
24+
- { name: "musllinux_1_1_x86_64", CONTAINER: "cryptography-musllinux_1_1:x86_64"}
25+
exclude:
26+
# There are no readily available musllinux PyPy distributions
27+
- PYTHON: { VERSION: "pypy3.6", PATH: "/opt/pypy3.6/bin/pypy" }
28+
MANYLINUX: { name: "musllinux_1_1_x86_64", CONTAINER: "cryptography-musllinux_1_1:x86_64" }
29+
- PYTHON: { VERSION: "pypy3.7", PATH: "/opt/pypy3.7/bin/pypy" }
30+
MANYLINUX: { name: "musllinux_1_1_x86_64", CONTAINER: "cryptography-musllinux_1_1:x86_64"}
2431
name: "${{ matrix.PYTHON.VERSION }} for ${{ matrix.MANYLINUX.NAME }}"
2532
steps:
2633
- run: ${{ matrix.PYTHON.PATH }} -m venv .venv
@@ -41,8 +48,8 @@ jobs:
4148
- run: auditwheel repair --plat ${{ matrix.MANYLINUX.NAME }} tmpwheelhouse/cryptograph*.whl -w wheelhouse/
4249
- run: unzip wheelhouse/*.whl -d execstack.check
4350
- run: |
44-
results=$(execstack execstack.check/cryptography/hazmat/bindings/*.so)
45-
count=$(echo "$results" | grep -c '^X' || true)
51+
results=$(readelf -lW execstack.check/cryptography/hazmat/bindings/*.so)
52+
count=$(echo "$results" | grep -c 'GNU_STACK.*[R ][W ]E' || true)
4653
if [ "$count" -ne 0 ]; then
4754
exit 1
4855
else

0 commit comments

Comments
 (0)