attempt to merge wheel builds

whitews · Oct 5, 2023 · bd2a9c8 · bd2a9c8
1 parent 7b0d4aa
commit bd2a9c8
Showing 1 changed file with 3 additions and 38 deletions.
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -8,42 +8,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-22.04, windows-2022]
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          ref: 'master'
-
-      - name: Setup Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: 3.11
-
-      - name: Install cibuildwheel
-        run: python -m pip install cibuildwheel==2.15.0
-
-      - name: Build wheels
-        run: python -m cibuildwheel --output-dir wheelhouse
-        env:
-          CIBW_BEFORE_BUILD: |
-            pip install oldest-supported-numpy
-            pip freeze
-          CIBW_SKIP: pp* *-musllinux_* *-manylinux_i686 *-win32  # skip PyPy, musllinux, 32-bit Linux & win32 builds
-          CIBW_BUILD: cp37-* cp38-* cp39-* cp310-* cp311-* cp312-*
-
-      - name: Store artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          path: wheelhouse/*.whl
-
-  build_wheels_apple_silicon:
-    name: Build wheels on ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [macos-12]
+        os: [ubuntu-22.04, windows-2022, macos-12]
 
     steps:
       - name: Checkout
@@ -63,9 +28,9 @@ jobs:
         run: python -m cibuildwheel --output-dir wheelhouse
         env:
           CIBW_BEFORE_BUILD: pip install oldest-supported-numpy
-          CIBW_SKIP: pp*  # skip PyPy
-          CIBW_BUILD: cp38-* cp39-* cp310-* cp311-* cp312-*  # Only Python 3.8 - 3.12
+          CIBW_SKIP: pp* *-musllinux_* *-manylinux_i686 *-win32  # skip PyPy, musllinux, 32-bit Linux & win32 builds
           CIBW_ARCHS_MACOS: x86_64 arm64
+          CIBW_BUILD: cp37-* cp38-* cp39-* cp310-* cp311-* cp312-*
 
       - name: Store artifacts
         uses: actions/upload-artifact@v3