Skip to content

Commit 4c970a3

Browse files
authored
Fix building the wheel for windows (#190)
The CI job that builds the wheel for Windows fails. Try to fix it. Also upgrade versions for GH actions, and use ubuntu-latest instead of a specific version.
1 parent f4dd081 commit 4c970a3

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

.github/workflows/REUSABLE-wheeler.yaml

+18-19
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
runs-on: ${{ matrix.os }}
2222
strategy:
2323
matrix:
24-
os: [ubuntu-20.04, windows-2019, macos-latest]
24+
os: [ubuntu-latest, windows-latest, macos-latest]
2525
env:
2626
CIBW_ARCHS_MACOS: "x86_64 universal2 arm64"
2727
MACOSX_DEPLOYMENT_TARGET: "10.15"
@@ -32,70 +32,69 @@ jobs:
3232

3333
- name: Set up QEMU
3434
if: runner.os == 'Linux'
35-
uses: docker/setup-qemu-action@v2
35+
uses: docker/setup-qemu-action@v3
3636
with:
3737
platforms: all
3838

3939
- name: Build wheels
40-
uses: pypa/cibuildwheel@v2.16.2
40+
uses: pypa/cibuildwheel@v2.19.2
4141
env:
4242
# configure cibuildwheel to build native archs ('auto'), and some
4343
# emulated ones
4444
CIBW_ARCHS_LINUX: auto aarch64 ppc64le s390x
4545

46-
- uses: actions/upload-artifact@v3
46+
- uses: actions/upload-artifact@v4
4747
with:
4848
name: ${{matrix.os}}-wheels
4949
path: ./wheelhouse/*.whl
5050

5151
build_sdist:
5252
name: Build source dist
53-
runs-on: ubuntu-20.04
53+
runs-on: ubuntu-latest
5454
steps:
55-
- uses: actions/setup-python@v4
55+
- uses: actions/setup-python@v5
5656
with:
57-
python-version: '3.10'
58-
- uses: actions/checkout@v3
57+
python-version: 3.10
58+
- uses: actions/checkout@v4
5959
with:
6060
submodules: recursive
6161
- name: Build sdist
6262
run: |
6363
python3 setup.py sdist
64-
- uses: actions/upload-artifact@v3
64+
- uses: actions/upload-artifact@v4
6565
with:
6666
name: source-dist
6767
path: ./dist/*.tar.gz
6868

6969
publish:
7070
name: Pypi publish
7171
if: ${{inputs.release == true}}
72-
# needs: ['build_wheels', 'build_sdist']
7372
needs: ['build_wheels', 'build_sdist']
7473
runs-on: ubuntu-latest
7574
steps:
76-
- uses: actions/setup-python@v4
75+
- uses: actions/setup-python@v5
7776
with:
78-
python-version: 3.9
77+
python-version: 3.10
7978
- name: Install tools
8079
run: |
8180
pip install twine wheel
82-
- uses: actions/download-artifact@v3
81+
- uses: actions/download-artifact@v4
8382
with:
84-
name: ubuntu-20.04-wheels
83+
name: ubuntu-latest-wheels
8584
path: artifacts/linux
86-
- uses: actions/download-artifact@v3
85+
- uses: actions/download-artifact@v4
8786
with:
88-
name: windows-2019-wheels
87+
name: windows-latest-wheels
8988
path: artifacts/windows
90-
- uses: actions/download-artifact@v3
89+
- uses: actions/download-artifact@v4
9190
with:
9291
name: macos-latest-wheels
9392
path: artifacts/macos
94-
- uses: actions/download-artifact@v3
93+
- uses: actions/download-artifact@v4
9594
with:
9695
name: source-dist
9796
path: artifacts/sdist
98-
- name: unify wheel structure
97+
- name: Unify wheel structure
9998
run: |
10099
mkdir dist
101100
cp -R artifacts/windows/* dist

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ MANIFEST
55
.venv
66
**/*.so
77
hiredis.egg-info
8+
.idea

0 commit comments

Comments
 (0)