cicd/lib-build-and-push: build pypy and native in single blow

Author: dkropachev

.github/workflows/build-pre-release.yml

@@ -10,8 +10,8 @@ on:
 
       target:
         type: string
-        description: "target os to build for: linux,macos,windows"
-        default: "linux,macos,windows"
+        description: "target os to build for: linux,macos-x86,macos-arm,windows,linux-aarch64"
+        default: "linux,macos-x86,macos-arm,windows,linux-aarch64"
 
 jobs:
   build-and-publish:

.github/workflows/build-push.yml

@@ -26,4 +26,3 @@ jobs:
     with:
       upload: ${{ github.event_name == 'push' && endsWith(github.event.ref, 'scylla') }}
       python-version: '3.13'
-      target: linux,macos,windows

.github/workflows/lib-build-and-push.yml

@@ -19,7 +19,7 @@ on:
         description: "target os to build for: linux,macos,windows"
         type: string
         required: false
-        default: "linux,macos,windows"
+        default: "linux,macos-x86,macos-arm,windows,linux-aarch64"
 
 jobs:
   prepare-matrix:
@@ -33,19 +33,27 @@ jobs:
         run: |
           echo -n "[" > /tmp/matrix.json
           was_added=""
-          for os in $(echo "${{ inputs.target }}" | tr -d " " | tr "," "\n")
+          for target in $(echo "${{ inputs.target }}" | tr -d " " | tr "," "\n")
           do
-           if [[ "${os}" == "linux" ]]; then
+           if [[ "${target}" == "linux" ]]; then
              [ -n "$was_added" ] && echo -n ","  >> /tmp/matrix.json
-             echo -n '{"os":"ubuntu-20.04","platform":"x86_64"},{"os":"ubuntu-20.04","platform":"PyPy"},{"os":"ubuntu-24.04","platform":"aarch64"}' >> /tmp/matrix.json
+             echo -n '{"os":"ubuntu-20.04", "target": "linux"}' >> /tmp/matrix.json
              was_added=1
-           elif [[ "${os}" == "windows" ]]; then
+           elif [[ "${target}" == "linux-aarch64" ]]; then
              [ -n "$was_added" ] && echo -n ","  >> /tmp/matrix.json
-             echo -n  '{"os":"windows-2022","platform":"win64"},{"os":"windows-2022","platform":"PyPy"}' >> /tmp/matrix.json
+             echo -n  '{"os":"ubuntu-20.04", "target": "linux-aarch64"}' >> /tmp/matrix.json
              was_added=1
-           elif [[ "${os}" == "macos" ]]; then
+           elif [[ "${target}" == "windows" ]]; then
              [ -n "$was_added" ] && echo -n ","  >> /tmp/matrix.json
-             echo -n  '{"os":"macos-14","platform":"all"},{"os":"macos-13","platform":"all"},{"os":"macos-14","platform":"PyPy"}' >> /tmp/matrix.json
+             echo -n  '{"os":"windows-2022", "target": "windows"}' >> /tmp/matrix.json
+             was_added=1
+           elif [[ "${target}" == "macos-x86" ]]; then
+             [ -n "$was_added" ] && echo -n ","  >> /tmp/matrix.json
+             echo -n  '{"os":"macos-13", "target": "macos-x86"}' >> /tmp/matrix.json
+             was_added=1
+           elif [[ "${target}" == "macos-arm" ]]; then
+             [ -n "$was_added" ] && echo -n ","  >> /tmp/matrix.json
+             echo -n  '{"os":"macos-14", "target": "macos-arm"}' >> /tmp/matrix.json
              was_added=1
            fi
           done
@@ -54,7 +62,7 @@ jobs:
           echo "matrix=$(cat /tmp/matrix.json)" >> $GITHUB_OUTPUT
 
   build-wheels:
-    name: Build wheels ${{ matrix.os }} (${{ matrix.platform }})
+    name: Build wheels for ${{ matrix.target }} on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     needs: prepare-matrix
     strategy:
@@ -86,7 +94,7 @@ jobs:
           choco install openssl --version=3.4.1 -f -y --no-progress
 
       - name: Set up QEMU
-        if: runner.os == 'Linux' && matrix.platform == 'aarch64'
+        if: matrix.target == 'linux-aarch64'
         uses: docker/setup-qemu-action@v3
         with:
           platforms: all
@@ -119,28 +127,19 @@ jobs:
             echo "Enforcing target deployment for 14.0"
           fi
 
-      - name: Set build target
-        shell: bash
-        run: |
-          if [[ "${{ matrix.platform }}" == "PyPy" ]]; then
-            echo "CIBW_BUILD=pp*" >> $GITHUB_ENV;
-          else
-            echo "CIBW_BUILD=cp*" >> $GITHUB_ENV;
-          fi
-
       - name: Build wheels
-        if: runner.os != 'Linux' || matrix.platform != 'aarch64'
+        if: matrix.target != 'linux-aarch64'
         run: |
           python3 -m cibuildwheel --output-dir wheelhouse
 
-      - name: Build wheels
-        if: runner.os == 'Linux' && matrix.platform == 'aarch64'
+      - name: Build wheels for linux aarch64
+        if: matrix.target == 'linux-aarch64'
         run: |
-          python -m cibuildwheel --archs aarch64 --output-dir wheelhouse
+          CIBW_BUILD='cp3*' python -m cibuildwheel --archs aarch64 --output-dir wheelhouse
 
       - uses: actions/upload-artifact@v4
         with:
-          name: wheels-${{ runner.os }}-${{ matrix.platform }}
+          name: wheels-${{ matrix.target }}-${{ matrix.os }}
           path: ./wheelhouse/*.whl
 
   build-sdist:

pyproject.toml

@@ -90,7 +90,7 @@ tag_regex = '(?P<version>\d*?\.\d*?\.\d*?)-scylla'
 build-frontend = "build[uv]"
 environment = { CASS_DRIVER_BUILD_CONCURRENCY = "2", CASS_DRIVER_BUILD_EXTENSIONS_ARE_MUST = "yes", CFLAGS = "-g0 -O3" }
 skip = ["cp2*", "cp36*", "pp36*", "cp37*", "pp37*", "*i686", "*musllinux*"]
-build = ["cp3*"]
+build = ["cp3*", "pp3*"]
 
 before-test = "pip install -r {project}/test-requirements.txt"
 
@@ -109,7 +109,6 @@ test-command = [
 
 [tool.cibuildwheel.macos]
 build-frontend = "build"
-build = ["cp3*"]
 test-command = [
     "pytest {project}/tests/unit -k 'not (test_multi_timer_validation or test_empty_connections or test_timer_cancellation)'"
 ]