Skip to content

Commit ec05db6

Browse files
committed
ci: update cibuildwheel
This is an attempt to fix the macos has the wrong *.so part of the issue zxing-cpp#695.
1 parent f7c9de4 commit ec05db6

1 file changed

Lines changed: 20 additions & 10 deletions

File tree

‎.github/workflows/publish-python.yml‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,27 +26,31 @@ jobs:
2626

2727
steps:
2828
- uses: actions/checkout@v4
29+
with:
30+
fetch-depth: 0
2931

3032
- name: Set up Python
3133
uses: actions/setup-python@v5
32-
with:
33-
python-version: '3.12'
3434

3535
- name: Install cibuildwheel
36-
run: python3 -m pip install cibuildwheel==2.16.2
36+
run: python3 -m pip install cibuildwheel==2.16.5
3737

3838
- name: Build wheels
3939
run: python3 -m cibuildwheel --output-dir wheelhouse wrappers/python
4040
env:
41-
CIBW_BUILD: cp38-* cp39-* cp310-* cp311-* cp312-*
41+
CIBW_BUILD: cp39-* cp310-* cp311-* cp312-*
4242
CIBW_SKIP: "*musllinux*"
4343
# the default maylinux2014 image does not contain a c++20 compiler, see https://github.com/pypa/manylinux
4444
CIBW_MANYLINUX_X86_64_IMAGE: quay.io/pypa/manylinux_2_28_x86_64
45-
CIBW_ARCHS_MACOS: universal2
46-
CIBW_ENVIRONMENT_MACOS: CMAKE_OSX_ARCHITECTURES="arm64;x86_64"
45+
CIBW_ARCHS_MACOS: "x86_64 arm64" # universal2
46+
# CIBW_ENVIRONMENT_MACOS: CMAKE_OSX_ARCHITECTURES="arm64;x86_64"
47+
MACOSX_DEPLOYMENT_TARGET: "10.13"
48+
CIBW_BUILD_VERBOSITY: 1
4749

48-
- uses: actions/upload-artifact@v3 # v4 breaks the build, see https://github.com/actions/upload-artifact/blob/main/docs/MIGRATION.md
50+
- name: Upload wheels
51+
uses: actions/upload-artifact@v4 # v4 breaks the build, see https://github.com/actions/upload-artifact/blob/main/docs/MIGRATION.md
4952
with:
53+
name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}
5054
path: ./wheelhouse/*.whl
5155

5256
build-sdist:
@@ -55,7 +59,7 @@ jobs:
5559
steps:
5660
- uses: actions/checkout@v4
5761
with:
58-
submodules: recursive
62+
fetch-depth: 0
5963

6064
- name: Set up Python
6165
uses: actions/setup-python@v5
@@ -70,8 +74,10 @@ jobs:
7074
working-directory: wrappers/python
7175
run: python3 setup.py sdist
7276

73-
- uses: actions/upload-artifact@v3
77+
- name: Upload sdist
78+
uses: actions/upload-artifact@v4
7479
with:
80+
name: cibw-sdist
7581
path: wrappers/python/dist/*.tar.gz
7682

7783
upload-pypi:
@@ -89,8 +95,12 @@ jobs:
8995
steps:
9096
- uses: actions/download-artifact@v4
9197
with:
92-
name: artifact
98+
pattern: cibw-*
9399
path: dist
100+
merge-multiple: true
101+
102+
- name: List wheels
103+
run: ls dist
94104

95105
- uses: pypa/gh-action-pypi-publish@release/v1
96106
# with:

0 commit comments

Comments
 (0)