From 4c3665ebaec08ced2b7b63c350b3e47daaf1aa3b Mon Sep 17 00:00:00 2001 From: Nikolaus Waxweiler Date: Tue, 3 Oct 2023 16:46:55 +0100 Subject: [PATCH 1/2] Build Python 3.12 wheels --- .github/workflows/ci.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c860e0325..d0effb6d3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -74,11 +74,11 @@ jobs: matrix: os: [ubuntu-22.04, windows-2022, macos-12] arch: [auto64] - cp: ["cp3{7,8,9,10,11}"] + cp: ["cp3{7,8,9,10,11,12}"] include: - os: macos-12 arch: arm64 - cp: "cp3{7,8,9,10,11}" + cp: "cp3{7,8,9,10,11,12}" # aarch64 is emulated and takes longer, build one wheel per job - os: ubuntu-22.04 arch: aarch64 @@ -95,6 +95,9 @@ jobs: - os: ubuntu-22.04 arch: aarch64 cp: cp311 + - os: ubuntu-22.04 + arch: aarch64 + cp: cp312 steps: - uses: actions/checkout@v3 From 65666a837ef63ec7cba0ef07fd74625cd3ef33c0 Mon Sep 17 00:00:00 2001 From: Nikolaus Waxweiler Date: Thu, 5 Oct 2023 09:54:30 +0100 Subject: [PATCH 2/2] Update image pins and cibuildwheel --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d0effb6d3..be4bd874e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,8 +28,8 @@ jobs: - name: Set up QEMU uses: docker/setup-qemu-action@v2 - name: Build skia 3rd-Party - # Taken from https://github.com/pypa/cibuildwheel/blob/v2.12.1/cibuildwheel/resources/pinned_docker_images.cfg - uses: docker://quay.io/pypa/manylinux2014_aarch64:2023-03-05-271004f + # Taken from https://github.com/pypa/cibuildwheel/blob/v2.16.2/cibuildwheel/resources/pinned_docker_images.cfg + uses: docker://quay.io/pypa/manylinux2014_aarch64:2023-10-03-72cdc42 if: ${{ steps.cache-skia.outputs.cache-hit != 'true' }} with: args: bash -c "git config --global --add safe.directory '*' && @@ -60,7 +60,7 @@ jobs: - name: Set up QEMU uses: docker/setup-qemu-action@v2 - name: Build Skia Proper - uses: docker://quay.io/pypa/manylinux2014_aarch64:2023-03-05-271004f + uses: docker://quay.io/pypa/manylinux2014_aarch64:2023-10-03-72cdc42 with: args: bash -c "git config --global --add safe.directory '*' && bash scripts/build_Linux.sh @@ -119,7 +119,7 @@ jobs: platforms: ${{ matrix.arch }} - name: Build wheels - uses: pypa/cibuildwheel@v2.12.1 + uses: pypa/cibuildwheel@v2.16.2 env: CIBW_BUILD: "${{ matrix.cp }}-*" CIBW_SKIP: "*musllinux*"