Skip to content

Commit 34f2b8b

Browse files
committed
Update cibuildwheel to 2.3.1
Because cibuildwheel switched to pip 21.3 that uses in-tree builds, we need to add an explicit clean step. This is because the FreeType built for 64-bit and 32-bit Windows are not compatible, but as they appear to be named the same, aren't rebuilt for each wheel, causing linker issues when mixed. I'm not sure it's necessary on other platforms as well, but it can't hurt.
1 parent 0dd4e58 commit 34f2b8b

File tree

1 file changed

+20
-8
lines changed

1 file changed

+20
-8
lines changed

.github/workflows/cibuildwheel.yml

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,40 +53,52 @@ jobs:
5353
fetch-depth: 0
5454

5555
- name: Build wheels for CPython 3.10
56-
uses: pypa/cibuildwheel@v2.1.1
56+
uses: pypa/cibuildwheel@v2.3.1
5757
env:
5858
CIBW_BUILD: "cp310-*"
59+
CIBW_SKIP: "*-musllinux*"
5960
CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
6061
CIBW_MANYLINUX_I686_IMAGE: manylinux2014
61-
CIBW_BEFORE_BUILD: pip install certifi oldest-supported-numpy
62+
CIBW_BEFORE_BUILD: >-
63+
pip install certifi oldest-supported-numpy &&
64+
git clean -fxd build
6265
MPL_DISABLE_FH4: "yes"
6366
CIBW_ARCHS: ${{ matrix.cibw_archs }}
6467

6568
- name: Build wheels for CPython 3.9
66-
uses: pypa/cibuildwheel@v2.1.1
69+
uses: pypa/cibuildwheel@v2.3.1
6770
env:
6871
CIBW_BUILD: "cp39-*"
72+
CIBW_SKIP: "*-musllinux*"
6973
CIBW_MANYLINUX_X86_64_IMAGE: manylinux1
7074
CIBW_MANYLINUX_I686_IMAGE: manylinux1
71-
CIBW_BEFORE_BUILD: pip install certifi oldest-supported-numpy
75+
CIBW_BEFORE_BUILD: >-
76+
pip install certifi oldest-supported-numpy &&
77+
git clean -fxd build
7278
MPL_DISABLE_FH4: "yes"
7379
CIBW_ARCHS: ${{ matrix.cibw_archs }}
7480

7581
- name: Build wheels for CPython 3.8
76-
uses: pypa/cibuildwheel@v2.1.1
82+
uses: pypa/cibuildwheel@v2.3.1
7783
env:
7884
CIBW_BUILD: "cp38-*"
85+
CIBW_SKIP: "*-musllinux*"
7986
CIBW_MANYLINUX_X86_64_IMAGE: manylinux1
8087
CIBW_MANYLINUX_I686_IMAGE: manylinux1
81-
CIBW_BEFORE_BUILD: pip install certifi numpy==1.19.2
88+
CIBW_BEFORE_BUILD: >-
89+
pip install certifi numpy==1.19.2 &&
90+
git clean -fxd build
8291
MPL_DISABLE_FH4: "yes"
8392
CIBW_ARCHS: ${{ matrix.cibw_archs }}
8493

8594
- name: Build wheels for PyPy
86-
uses: pypa/cibuildwheel@v2.1.1
95+
uses: pypa/cibuildwheel@v2.3.1
8796
env:
8897
CIBW_BUILD: "pp38-*"
89-
CIBW_BEFORE_BUILD: pip install certifi oldest-supported-numpy
98+
CIBW_SKIP: "*-musllinux*"
99+
CIBW_BEFORE_BUILD: >-
100+
pip install certifi oldest-supported-numpy &&
101+
git clean -fxd build
90102
CIBW_ARCHS: ${{ matrix.cibw_archs }}
91103
PIP_USE_FEATURE: in-tree-build
92104
if: false && matrix.cibw_archs != 'aarch64'

0 commit comments

Comments
 (0)