Skip to content

Commit

Permalink
Include more archs in wheel building
Browse files Browse the repository at this point in the history
  • Loading branch information
djhoese committed Sep 22, 2023
1 parent 699dc7b commit 969681a
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 89 deletions.
64 changes: 22 additions & 42 deletions .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Deploy sdist and wheels
name: Build sdist and wheels
# https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#concurrency
# https://docs.github.com/en/developers/webhooks-and-events/events/github-event-types#pullrequestevent
concurrency:
Expand All @@ -21,6 +21,8 @@ jobs:

- name: Create sdist
shell: bash -l {0}
# For non-tags/releases this won't produce a valid version number in the package
# We'd have to download the entire git history which is wasteful in CI
run: |
python -m pip install -q build
python -m build -s
Expand All @@ -33,61 +35,39 @@ jobs:


build_wheels:
name: "Build wheels on ${{ matrix.os }}"
name: "Build wheels on ${{ matrix.os }} ${{ matrix.cibw_archs }}"
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [windows-2019, macos-11, ubuntu-20.04]
include:
- os: windows-2019
cibw_archs: "AMD64 ARM64"
- os: macos-11
cibw_archs: "x86_64 arm64"
- os: "ubuntu-20.04"
cibw_archs: "aarch64"
- os: "ubuntu-20.04"
cibw_archs: "x86_64"

steps:
- uses: actions/checkout@v4
- run: |
git fetch --prune --unshallow
- name: Set up QEMU
if: runner.os == 'Linux'
uses: docker/setup-qemu-action@v3
with:
platforms: all

- name: Build wheels
uses: pypa/[email protected]
env:
CIBW_SKIP: "cp36-* cp37-* cp38-* pp* *-manylinux_i686 *-musllinux*"
CIBW_ARCHS: auto64
CIBW_SKIP: "cp36-* cp37-* cp38-* pp* *i686 *-musllinux_aarch64"
CIBW_ARCHS: "${{ matrix.cibw_archs }}"
CIBW_TEST_COMMAND: "python -c \"import pyresample; assert 'unknown' not in pyresample.__version__, 'incorrect version found'\""


#
#
# - name: Install dependencies
# run: |
# python -m pip install -U -q pip Cython wheel setuptools twine numpy build
#
# - name: Build and install macOS/Windows wheel
# if: matrix.os != 'ubuntu-latest'
# run: |
# python -m build -w
# pip install --find-links=./dist/ pyresample
#
# - name: Build Linux wheels inside docker
# if: matrix.os == 'ubuntu-latest'
# run: |
# docker run \
# -e PLAT=${{ matrix.docker-image }} \
# -e USE_OMP=1 \
# -v `pwd`:/io \
# quay.io/pypa/${{ matrix.docker-image }} \
# /io/continuous_integration/build-manylinux-wheels.sh
#
# - name: Check version number from inside wheel
# if: matrix.docker-image != 'manylinux2014_i686'
# # install dependencies
# # uninstall source installation
# # move source to make sure it isn't include in checks
# run: |
# python -m pip install pip-tools
# python -m piptools compile -o requirements.txt
# mv pyresample unused_src_to_prevent_local_import
# python -m pip install -r requirements.txt
# python -m pip install --force-reinstall --no-index --no-cache-dir --no-deps --find-links=./dist/ pyresample
# python -c "import pyresample; print(pyresample.__file__, pyresample.__version__)"
# python -c "import pyresample; assert 'unknown' not in pyresample.__version__, 'incorrect version found'"
CIBW_TEST_SKIP: "*_arm64 *_universal2:arm64"

- name: Upload wheel(s) as build artifacts
uses: actions/upload-artifact@v3
Expand Down
47 changes: 0 additions & 47 deletions continuous_integration/build-manylinux-wheels.sh

This file was deleted.

0 comments on commit 969681a

Please sign in to comment.