Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add missing macos arm64 wheel. #298

Merged
merged 2 commits into from
Jan 30, 2024
Merged

Add missing macos arm64 wheel. #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
995cfd3
Fix missing macOS arm64 support.
graphenn Jan 30, 2024
96cb0e3
Update actions to avoid upload action deprecated warnings regarding N…
graphenn Jan 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ jobs:

- name: Upload sdist tarball
if: runner.os == 'Linux'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: sdist
path: dist/cyvcf2-*.tar.gz
Expand Down
22 changes: 16 additions & 6 deletions .github/workflows/wheels.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ jobs:
- [ubuntu-22.04, musllinux_x86_64]
- [ubuntu-22.04, manylinux_aarch64]
- [ubuntu-22.04, musllinux_aarch64]
# macOS build arm64 on x86_64 with cross-compiler
- [macos-12, macosx_x86_64]
- [macos-12, macosx_arm64]
python-version: [pp310, cp37, cp38, cp39, cp310, cp311, cp312]
exclude:
# pp310, cp37, cp38 on musllinux is not support
Expand All @@ -49,6 +49,11 @@ jobs:
python-version: cp310
- buildplat: [ubuntu-22.04, musllinux_aarch64]
python-version: pp310
# cp37, pp310 on macos arm64 is not supported
- buildplat: [macos-12, macosx_arm64]
python-version: cp37
- buildplat: [macos-12, macosx_arm64]
python-version: pp310

steps:
- uses: actions/checkout@v4
Expand All @@ -60,7 +65,7 @@ jobs:
uses: docker/setup-qemu-action@v3

- name: Build wheels
uses: pypa/[email protected].2
uses: pypa/[email protected].4
with:
package-dir: .
output-dir: wheelhouse
Expand Down Expand Up @@ -88,14 +93,17 @@ jobs:
CYVCF2_HTSLIB_CONFIGURE_OPTIONS="--enable-libcurl --enable-s3 --enable-lzma --enable-bz2 --with-libdeflate"
CYTHONIZE=1
CIBW_TEST_COMMAND: "{project}/ci/test"
# macOS build arm64 on x86_64 with cross-compiler, not support test
CIBW_TEST_SKIP: "*-macosx_arm64"

# Enable tmate debugging of manually-triggered workflows if the input option was provided
- name: Setup tmate session
if: ${{ always() && github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled == 'true' }}
uses: mxschmitt/action-tmate@v3

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: artifact-${{ matrix.python-version }}-${{ matrix.buildplat[1] }}
path: ./wheelhouse/*.whl

build_sdist:
Expand All @@ -117,8 +125,9 @@ jobs:
- name: Build sdist
run: CYTHONIZE=1 python setup.py sdist

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: artifact-sdist
path: dist/*.tar.gz

upload_pypi:
Expand All @@ -127,9 +136,10 @@ jobs:
# upload to PyPI on every tag starting with 'v'
if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/v')
steps:
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: artifact
pattern: artifact-*
merge-multiple: true
path: dist

- uses: pypa/gh-action-pypi-publish@release/v1
Expand Down