Skip to content

Commit fe24406

Browse files
committed
Fix aarch64 wheel build.
1 parent a2600ab commit fe24406

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,9 @@ jobs:
1717
- manylinux1_i686
1818
- manylinux_2_24_x86_64
1919
- manylinux_2_24_i686
20-
- manylinux_2_24_aarch64
2120
- musllinux_1_1_x86_64
22-
pyversion: ["*"]
21+
pyversion: ["cp*"]
2322

24-
exclude:
25-
- image: manylinux_2_24_aarch64
26-
pyversion: "*"
2723
include:
2824
- image: manylinux_2_24_aarch64
2925
pyversion: "cp37*"
@@ -103,11 +99,11 @@ jobs:
10399
uses: softprops/action-gh-release@v1
104100
if: startsWith(github.ref, 'refs/tags/')
105101
with:
106-
files: dist/lxml-*.whl
102+
files: dist/*.whl
107103

108104
- name: Upload wheels
109105
uses: actions/upload-artifact@v2
110106
with:
111107
name: wheels-${{ matrix.os }}
112-
path: dist/lxml-*.whl
108+
path: dist/*.whl
113109
if-no-files-found: ignore

Makefile

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,14 @@ PYTHON?=python
22
VERSION?=$(shell sed -ne "s|^__version__\s*=\s*'\([^']*\)'.*|\1|p" src/quicktions.pyx)
33
PACKAGE=quicktions
44
WITH_CYTHON := $(shell python -c 'from Cython.Build import cythonize' 2>/dev/null && echo "--with-cython")
5+
PYTHON_WHEEL_BUILD_VERSION := "cp*"
56

67
MANYLINUX_IMAGES= \
7-
manylinux2010_x86_64 \
8-
manylinux2010_i686 \
9-
manylinux2014_aarch64
8+
manylinux1_x86_64 \
9+
manylinux1_i686 \
10+
manylinux_2_24_x86_64 \
11+
manylinux_2_24_i686 \
12+
musllinux_1_1_x86_64
1013

1114
.PHONY: all local sdist test clean realclean wheel_manylinux
1215

@@ -50,7 +53,7 @@ wheel_%: dist/$(PACKAGE)-$(VERSION).tar.gz
5053
-e LDFLAGS="$(LDFLAGS) -fPIC" \
5154
-e WHEELHOUSE=wheelhouse$(subst wheel_manylinux,,$@) \
5255
quay.io/pypa/$(subst wheel_,,$@) \
53-
bash -c 'for PYBIN in /opt/python/cp*/bin; do \
56+
bash -c 'for PYBIN in /opt/python/$(PYTHON_WHEEL_BUILD_VERSION)/bin; do \
5457
$$PYBIN/python -V; \
5558
{ $$PYBIN/pip wheel -w /io/$$WHEELHOUSE /io/$< & } ; \
5659
done; wait; \

0 commit comments

Comments
 (0)