Combine build steps

radarhere · Jan 4, 2024 · 20e2efd · 20e2efd
1 parent 8bda1f2
commit 20e2efd
Showing 1 changed file with 2 additions and 17 deletions.
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -69,35 +69,20 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Install cibuildwheel
+      - name: Build wheels
         run: |
           python3 -m pip install -r .ci/requirements-cibw.txt
-
-      - name: Build wheels (manylinux)
-        if: matrix.spec != 'musllinux'
-        run: |
           python3 -m cibuildwheel --output-dir wheelhouse
         env:
           # Build only the currently selected Linux architecture (so we can
           # parallelise for speed).
           CIBW_ARCHS: "aarch64"
           # Likewise, select only one Python version per job to speed this up.
-          CIBW_BUILD: "${{ matrix.python-version }}-manylinux*"
+          CIBW_BUILD: "${{ matrix.python-version }}-${{ job.status == 'musllinux' && 'musllinux' || 'manylinux' }}*"
           # Extra options for manylinux.
           CIBW_MANYLINUX_AARCH64_IMAGE: ${{ matrix.spec }}
           CIBW_MANYLINUX_PYPY_AARCH64_IMAGE: ${{ matrix.spec }}
 
-      - name: Build wheels (musllinux)
-        if: matrix.spec == 'musllinux'
-        run: |
-          python3 -m cibuildwheel --output-dir wheelhouse
-        env:
-          # Build only the currently selected Linux architecture (so we can
-          # parallelise for speed).
-          CIBW_ARCHS: "aarch64"
-          # Likewise, select only one Python version per job to speed this up.
-          CIBW_BUILD: "${{ matrix.python-version }}-${{ matrix.spec }}*"
-
       - uses: actions/upload-artifact@v4
         with:
           name: dist-qemu-${{ matrix.python-version }}-${{ matrix.spec }}