Skip to content

Commit 90c7119

Browse files
committed
Fix duplicate name problem
1 parent ab76d9f commit 90c7119

1 file changed

Lines changed: 21 additions & 21 deletions

File tree

.github/workflows/wheels.yml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,21 @@ jobs:
2626
path: dist/*.tar.gz
2727

2828
build_wheels:
29+
name: Build wheels ${{ matrix.cpversion }}-${{ matrix.os.cibw-arch }}
30+
runs-on: ${{ matrix.os.runs-on }}
31+
32+
env:
33+
CIBW_BUILD_VERBOSITY: 3
34+
# This is very dubious... It *may* work because these are just cpp libraries that should not depend on the python version. Still, super-dubious.
35+
CIBW_TEST_REQUIRES: "gitpython"
36+
CIBW_TEST_COMMAND: "python {project}/tests/test_basic.py"
37+
CIBW_BUILD: "${{ matrix.cpversion }}-${{ matrix.os.cibw-arch }}"
38+
CIBW_TEST_SKIP: "*-macosx_arm64"
39+
CIBW_ENVIRONMENT: "MAX_JOBS=${{ matrix.os.runs-on == 'macos-latest' && 3 || 2 }}"
40+
# Why universal2 here? It's not included above in CIBW_BUILD
41+
CIBW_ARCHS_MACOS: "x86_64 arm64 universal2"
42+
CIBW_ENVIRONMENT_MACOS: "MACOSX_DEPLOYMENT_TARGET=10.13 CMAKE_OSX_ARCHITECTURES=\"${{ matrix.os.cibw-arch == 'macosx_x86_64' && 'x86_64' || matrix.os.cibw-arch == 'macosx_arm64' && 'arm64' || matrix.os.cibw-arch == 'macosx_universal2' && 'arm64;x86_64' || '' }}\""
43+
2944
strategy:
3045
fail-fast: false
3146
matrix:
@@ -53,30 +68,14 @@ jobs:
5368
- os:
5469
- runs-on: macos-latest
5570
cibw-arch: macosx_arm64
56-
cpversion: "cp36"
71+
cpversion: cp36
5772
- os:
5873
- runs-on: macos-latest
5974
cibw-arch: macosx_arm64
60-
cpversion: "cp37"
61-
62-
name: Build wheels ${{ matrix.cpversion }}-${{ matrix.os.cibw-arch }}
63-
runs-on: ${{ matrix.os.runs-on }}
64-
65-
env:
66-
CIBW_BUILD_VERBOSITY: 3
67-
# This is very dubious... It *may* work because these are just cpp libraries that should not depend on the python version. Still, super-dubious.
68-
CIBW_TEST_REQUIRES: "gitpython"
69-
CIBW_TEST_COMMAND: "python {project}/tests/test_basic.py"
70-
CIBW_BUILD: "${{ matrix.cpversion }}-${{ matrix.os.cibw-arch }}"
71-
CIBW_TEST_SKIP: "*-macosx_arm64"
72-
CIBW_ENVIRONMENT: "MAX_JOBS=${{ matrix.os.runs-on == 'macos-latest' && 3 || 2 }}"
73-
# Why universal2 here? It's not included above in CIBW_BUILD
74-
CIBW_ARCHS_MACOS: "x86_64 arm64 universal2"
75-
CIBW_ENVIRONMENT_MACOS: "MACOSX_DEPLOYMENT_TARGET=10.13 CMAKE_OSX_ARCHITECTURES=\"${{ matrix.os.cibw-arch == 'macosx_x86_64' && 'x86_64' || matrix.os.cibw-arch == 'macosx_arm64' && 'arm64' || matrix.os.cibw-arch == 'macosx_universal2' && 'arm64;x86_64' || '' }}\""
76-
75+
cpversion: cp37
7776

7877
steps:
79-
- uses: actions/checkout@v3
78+
- uses: actions/checkout@v4
8079

8180
- uses: actions/setup-python@v5
8281
name: Install Python
@@ -93,13 +92,14 @@ jobs:
9392
# Upload binaries to github
9493
- uses: actions/upload-artifact@v4
9594
with:
96-
path: |
95+
name: artefact-${{ matrix.cpversion }}-${{ matrix.os.cibw-arch }}
96+
path: |-
9797
./wheelhouse/*.whl
9898
./wheelhouse/*.tar.gz
9999
100100
# # Push the resulting binaries to pypi on a tag starting with 'v'
101101
upload_pypi:
102-
needs: [build_wheels]
102+
needs: build_wheels
103103
runs-on: ubuntu-latest
104104
# upload to PyPI on every tag starting with 'v'
105105
# if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/v')

0 commit comments

Comments
 (0)