Merge pull request uploadcare#110 from radarhere/qemu

scyclops · Jan 4, 2024 · e32f49a · e32f49a
2 parents 32ae1bd + f184775
commit e32f49a
Showing 1 changed file with 11 additions and 18 deletions.
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -69,31 +69,19 @@ jobs:
         run: |
           python3 -m pip install -r .ci/requirements-cibw.txt
 
-      - name: Build wheels (manylinux)
-        if: matrix.spec != 'musllinux'
+      - name: Build wheels
         run: |
           python3 -m cibuildwheel --output-dir wheelhouse
         env:
           # Build only the currently selected Linux architecture (so we can
           # parallelise for speed).
-          CIBW_ARCHS_LINUX: "aarch64"
+          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 }}-${{ matrix.spec == '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_LINUX: "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 }}
@@ -131,9 +119,12 @@ jobs:
         with:
           python-version: "3.x"
 
-      - name: Build wheels
+      - name: Install cibuildwheel
         run: |
           python3 -m pip install -r .ci/requirements-cibw.txt
+
+      - name: Build wheels
+        run: |
           python3 -m cibuildwheel --output-dir wheelhouse
         env:
           CIBW_ARCHS: ${{ matrix.cibw_arch }}
@@ -175,6 +166,10 @@ jobs:
         with:
           python-version: "3.x"
 
+      - name: Install cibuildwheel
+        run: |
+          python.exe -m pip install -r .ci/requirements-cibw.txt
+
       - name: Prepare for build
         run: |
           choco install nasm --no-progress
@@ -183,8 +178,6 @@ jobs:
           # Install extra test images
           xcopy /S /Y Tests\test-images\* Tests\images
 
-          & python.exe -m pip install -r .ci/requirements-cibw.txt
-
           & python.exe winbuild\build_prepare.py -v --no-imagequant --architecture=${{ matrix.arch }}
         shell: pwsh