From 51ed15d150167c9beb0059dece5a84aa8ddc0d1a Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Fri, 5 Feb 2021 17:25:53 -0500 Subject: [PATCH] ci: support Universal2 wheels --- .github/workflows/wheels.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 2ae201edd..4cf3edcb3 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -47,19 +47,26 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, windows-latest, macos-latest] + arch: [auto] type: [Standard] include: - os: ubuntu-latest type: Standard + arch: auto CIBW_MANYLINUX_X86_64_IMAGE: manylinux2010 CIBW_MANYLINUX_I686_IMAGE: manylinux2010 - os: ubuntu-latest type: ManyLinux1 + arch: auto CIBW_MANYLINUX_X86_64_IMAGE: skhep/manylinuxgcc-x86_64 CIBW_MANYLINUX_I686_IMAGE: skhep/manylinuxgcc-i686 + - os: macos-latest + type: Standard + arch: universal2 + steps: - uses: actions/checkout@v1 with: @@ -70,13 +77,10 @@ jobs: CIBW_SKIP: cp27-win* pp27* CIBW_MANYLINUX_I686_IMAGE: ${{ matrix.CIBW_MANYLINUX_I686_IMAGE }} CIBW_MANYLINUX_X86_64_IMAGE: ${{ matrix.CIBW_MANYLINUX_X86_64_IMAGE }} + CIBW_ARCH: ${{ matrix.arch }} CIBW_TEST_EXTRAS: test CIBW_TEST_COMMAND: "pytest {project}/tests" - CIBW_TEST_SKIP: "pp*macos*" - - - name: Show files - run: ls -lh wheelhouse - shell: bash + CIBW_TEST_SKIP: "pp*macos* *universal2:arm64" - name: Verify clean directory run: git diff --exit-code @@ -119,10 +123,6 @@ jobs: CIBW_TEST_EXTRAS: test CIBW_TEST_COMMAND: "pytest {project}/tests" - - name: Show files - run: ls -lh wheelhouse - shell: bash - - name: Verify clean directory run: git diff --exit-code shell: bash