Skip to content

Commit f5ddc22

Browse files
pzelaskopzelasko
authored
Merge pull request #17 from csukuangfj/wheel2
fix building wheels
2 parents c2a6d29 + f78ec70 commit f5ddc22

9 files changed

Lines changed: 67 additions & 38 deletions

‎.github/workflows/build-wheels-aarch64.yaml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,16 @@ concurrency:
1515

1616
jobs:
1717
build_wheels_aarch64:
18-
name: Build wheels for aarch64 on ${{ matrix.os }}
18+
name: ${{ matrix.python-version }}
1919
runs-on: ${{ matrix.os }}
2020
strategy:
2121
fail-fast: false
2222
matrix:
2323
os: [ubuntu-latest]
24+
python-version: ["cp37", "cp38", "cp39", "cp310", "cp311", "cp312"]
2425

2526
steps:
26-
- uses: actions/checkout@v2
27+
- uses: actions/checkout@v4
2728

2829
- name: Set up QEMU
2930
uses: docker/setup-qemu-action@v2
@@ -33,10 +34,11 @@ jobs:
3334
# see https://cibuildwheel.readthedocs.io/en/stable/changelog/
3435
# for a list of versions
3536
- name: Build wheels
36-
uses: pypa/cibuildwheel@v2.11.4
37+
uses: pypa/cibuildwheel@v2.16.5
3738
env:
3839
CIBW_BEFORE_BUILD: "pip install -U cmake numpy"
3940
CIBW_SKIP: "cp27-* cp35-* cp36-* *-win32 pp* *-musllinux* *-manylinux_i686"
41+
CIBW_BUILD: "${{ matrix.python-version}}-* "
4042
CIBW_BUILD_VERBOSITY: 3
4143
CIBW_ARCHS_LINUX: aarch64
4244

@@ -45,8 +47,9 @@ jobs:
4547
run: |
4648
ls -lh ./wheelhouse/
4749
48-
- uses: actions/upload-artifact@v2
50+
- uses: actions/upload-artifact@v4
4951
with:
52+
name: wheel-${{ matrix.python-version }}
5053
path: ./wheelhouse/*.whl
5154

5255
- name: Publish wheels to PyPI

‎.github/workflows/build-wheels-macos.yaml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,21 @@ concurrency:
1515

1616
jobs:
1717
build_wheels:
18-
name: Build wheels on ${{ matrix.os }}
18+
name: ${{ matrix.python-version }}
1919
runs-on: ${{ matrix.os }}
2020
strategy:
2121
fail-fast: false
2222
matrix:
2323
os: [macos-latest]
24+
python-version: ["cp38", "cp39", "cp310", "cp311", "cp312"]
2425

2526
steps:
26-
- uses: actions/checkout@v2
27+
- uses: actions/checkout@v4
2728

28-
# see https://cibuildwheel.readthedocs.io/en/stable/changelog/
29-
# for a list of versions
3029
- name: Build wheels
31-
uses: pypa/cibuildwheel@v2.11.4
30+
uses: pypa/cibuildwheel@v2.16.5
3231
env:
32+
CIBW_BUILD: "${{ matrix.python-version}}-* "
3333
CIBW_BEFORE_BUILD: "pip install -U cmake numpy"
3434
CIBW_ENVIRONMENT: KALDIALIGN_CMAKE_ARGS="-DCMAKE_OSX_ARCHITECTURES='arm64;x86_64'"
3535
CIBW_ARCHS: "universal2"
@@ -43,8 +43,9 @@ jobs:
4343
run: |
4444
ls -lh ./wheelhouse/
4545
46-
- uses: actions/upload-artifact@v2
46+
- uses: actions/upload-artifact@v4
4747
with:
48+
name: wheel-${{ matrix.python-version }}
4849
path: ./wheelhouse/*.whl
4950

5051
- name: Publish wheels to PyPI

‎.github/workflows/build-wheels-win32.yaml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,24 @@ concurrency:
1515

1616
jobs:
1717
build_wheels_win32:
18-
name: ${{ matrix.os }}
18+
name: ${{ matrix.python-version }}
1919
runs-on: ${{ matrix.os }}
2020
strategy:
2121
fail-fast: false
2222
matrix:
2323
os: [windows-latest]
24+
python-version: ["cp37", "cp38", "cp39", "cp310", "cp311", "cp312"]
2425

2526
steps:
26-
- uses: actions/checkout@v2
27+
- uses: actions/checkout@v4
2728

2829
# see https://cibuildwheel.readthedocs.io/en/stable/changelog/
2930
# for a list of versions
3031
- name: Build wheels
31-
uses: pypa/cibuildwheel@v2.11.4
32+
uses: pypa/cibuildwheel@v2.16.5
3233
env:
3334
CIBW_BEFORE_BUILD: "pip install -U cmake numpy"
35+
CIBW_BUILD: "${{ matrix.python-version}}-* "
3436
CIBW_ENVIRONMENT: KALDIALIGN_CMAKE_ARGS="-A Win32"
3537
CIBW_SKIP: "*-win_amd64"
3638
CIBW_BUILD_VERBOSITY: 3
@@ -40,8 +42,9 @@ jobs:
4042
run: |
4143
ls -lh ./wheelhouse/
4244
43-
- uses: actions/upload-artifact@v2
45+
- uses: actions/upload-artifact@v4
4446
with:
47+
name: wheel-${{ matrix.python-version }}
4548
path: ./wheelhouse/*.whl
4649

4750
- name: Publish wheels to PyPI

‎.github/workflows/build-wheels.yaml‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,33 +15,43 @@ concurrency:
1515

1616
jobs:
1717
build_wheels:
18-
name: Build wheels on ${{ matrix.os }}
18+
name: ${{ matrix.os }} ${{ matrix.python-version }}
1919
runs-on: ${{ matrix.os }}
2020
strategy:
2121
fail-fast: false
2222
matrix:
2323
os: [ubuntu-latest, windows-latest]
24+
python-version: ["cp37", "cp38", "cp39", "cp310", "cp311", "cp312"]
2425

2526
steps:
26-
- uses: actions/checkout@v2
27+
- uses: actions/checkout@v4
2728

2829
# see https://cibuildwheel.readthedocs.io/en/stable/changelog/
2930
# for a list of versions
3031
- name: Build wheels
31-
uses: pypa/cibuildwheel@v2.11.4
32+
uses: pypa/cibuildwheel@v2.16.5
3233
env:
33-
CIBW_SKIP: "cp27-* cp35-* *-win32 pp* *-musllinux*"
34+
CIBW_BUILD: "${{ matrix.python-version}}-* "
35+
CIBW_SKIP: "cp27-* cp35-* cp36-* *-win32 pp* *-musllinux* *-manylinux_i686"
3436
CIBW_BUILD_VERBOSITY: 3
3537

3638
- name: Display wheels
3739
shell: bash
3840
run: |
3941
ls -lh ./wheelhouse/
4042
41-
- uses: actions/upload-artifact@v2
43+
- uses: actions/upload-artifact@v4
4244
with:
45+
name: wheel-${{ matrix.os }}-${{ matrix.python-version }}
4346
path: ./wheelhouse/*.whl
4447

48+
- name: Build sdist
49+
if: matrix.os == 'ubuntu-latest' && matrix.python-version == '3.8'
50+
shell: bash
51+
run: |
52+
python3 setup.py sdist
53+
ls -lh dist/*
54+
4555
- name: Publish wheels to PyPI
4656
env:
4757
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
@@ -53,15 +63,9 @@ jobs:
5363
5464
twine upload ./wheelhouse/*.whl
5565
56-
- name: Build sdist
57-
if: ${{ matrix.os == 'ubuntu-latest' }}
58-
shell: bash
59-
run: |
60-
python3 setup.py sdist
61-
ls -lh dist/*
6266
6367
- name: Publish sdist to PyPI
64-
if: ${{ matrix.os == 'ubuntu-latest' }}
68+
if: matrix.os == 'ubuntu-latest' && matrix.python-version == '3.8'
6569
env:
6670
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
6771
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}

‎.github/workflows/build_conda_macos.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,21 @@ on:
66
- '*'
77
branches:
88
- conda
9+
workflow_dispatch:
910

1011
concurrency:
1112
group: build_conda_macos-${{ github.ref }}
1213
cancel-in-progress: true
1314

1415
jobs:
1516
build_conda_macos:
17+
name: ${{ matrix.python-version }}
1618
runs-on: ${{ matrix.os }}
1719
strategy:
1820
fail-fast: false
1921
matrix:
2022
os: [macos-12]
21-
python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]
23+
python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
2224

2325
steps:
2426
# refer to https://github.com/actions/checkout

‎.github/workflows/build_conda_ubuntu.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,25 @@ on:
66
- '*'
77
branches:
88
- conda
9+
workflow_dispatch:
910

1011
concurrency:
1112
group: build_conda_ubuntu-${{ github.ref }}
1213
cancel-in-progress: true
1314

1415
jobs:
1516
build_conda_ubuntu:
17+
name: ${{ matrix.python-version }}
1618
runs-on: ${{ matrix.os }}
1719
strategy:
1820
fail-fast: false
1921
matrix:
2022
os: [ubuntu-20.04]
21-
python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]
23+
python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
2224

2325
steps:
2426
# refer to https://github.com/actions/checkout
25-
- uses: actions/checkout@v2
27+
- uses: actions/checkout@v4
2628
with:
2729
fetch-depth: 0
2830

‎.github/workflows/build_conda_windows.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,25 @@ on:
77
branches:
88
- conda
99

10+
workflow_dispatch:
11+
1012
concurrency:
1113
group: build_conda_windows-${{ github.ref }}
1214
cancel-in-progress: true
1315

1416
jobs:
1517
build_conda_windows:
18+
name: ${{ matrix.python-version }}
1619
runs-on: ${{ matrix.os }}
1720
strategy:
1821
fail-fast: false
1922
matrix:
2023
os: [windows-2019]
21-
python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]
24+
python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
2225

2326
steps:
2427
# refer to https://github.com/actions/checkout
25-
- uses: actions/checkout@v2
28+
- uses: actions/checkout@v4
2629
with:
2730
fetch-depth: 0
2831

‎.github/workflows/test-pip-install.yaml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ on:
1313
# nightly test at 22:50 UTC time every day
1414
- cron: "50 22 * * *"
1515

16+
workflow_dispatch:
17+
1618
concurrency:
1719
group: test_pip_install-${{ github.ref }}
1820
cancel-in-progress: true
@@ -22,20 +24,24 @@ permissions:
2224

2325
jobs:
2426
test_pip_install:
27+
name: ${{ matrix.os }} ${{ matrix.python-version }}
2528
runs-on: ${{ matrix.os }}
2629
strategy:
2730
fail-fast: false
2831
matrix:
2932
os: [ubuntu-latest, macos-latest, windows-latest]
30-
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
33+
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
34+
exclude:
35+
- os: macos-latest
36+
python-version: "3.7"
3137

3238
steps:
33-
- uses: actions/checkout@v2
39+
- uses: actions/checkout@v4
3440
with:
3541
fetch-depth: 0
3642

3743
- name: Setup Python ${{ matrix.python-version }}
38-
uses: actions/setup-python@v2
44+
uses: actions/setup-python@v5
3945
with:
4046
python-version: ${{ matrix.python-version }}
4147

‎.github/workflows/test.yaml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,30 @@ on:
88
branches:
99
- main
1010

11+
workflow_dispatch:
12+
1113
jobs:
1214
run-test:
1315
runs-on: ${{ matrix.os }}
1416
strategy:
17+
fail-fast: false
1518
matrix:
1619
os: [ubuntu-latest, macos-latest, windows-latest]
17-
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
18-
fail-fast: false
20+
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
21+
exclude:
22+
- os: macos-latest
23+
python-version: "3.7"
1924

2025
steps:
21-
- uses: actions/checkout@v2
26+
- uses: actions/checkout@v4
2227

2328
# see https://github.com/microsoft/setup-msbuild
2429
- name: Add msbuild to PATH
2530
if: startsWith(matrix.os, 'windows')
2631
uses: microsoft/[email protected]
2732

2833
- name: Setup Python
29-
uses: actions/setup-python@v2
34+
uses: actions/setup-python@v5
3035
with:
3136
python-version: ${{ matrix.python-version }}
3237

0 commit comments

Comments
 (0)