From a3431723eb340668a55c1ce3082d16032ea19fe3 Mon Sep 17 00:00:00 2001 From: Michele Dolfi Date: Fri, 24 Jan 2025 16:04:06 +0100 Subject: [PATCH 1/4] trigger ci Signed-off-by: Michele Dolfi From c9974d724278e40458155d3f6be78d9ab00a895a Mon Sep 17 00:00:00 2001 From: Michele Dolfi Date: Sat, 25 Jan 2025 15:12:14 +0100 Subject: [PATCH 2/4] single arch, multi python Signed-off-by: Michele Dolfi --- .github/workflows/wheels.yml | 37 +++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 153e7440..b9eb4528 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -33,7 +33,7 @@ jobs: path: dist/ build_wheels: - name: Build wheel for py${{ matrix.python-version }} ${{ matrix.os.platform_id }} + name: Build wheel for ${{ matrix.os.platform_id }} ${{ matrix.os.arch }} runs-on: ${{ matrix.os.name }} strategy: @@ -41,26 +41,33 @@ jobs: # list of github vm: https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories fail-fast: false matrix: - python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"] + # python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"] + python-version: ["3.11"] os: - name: "ubuntu-latest" platform: "linux" + arch: "x86_64" platform_id: "manylinux_x86_64" - - name: "macos-13" - platform: "macos" - min_macos_version: "13" - platform_id: "macosx_x86_64" + - name: "ubuntu-latest" + platform: "linux" + arch: "aarch64" + platform_id: "manylinux_x86_64" - - name: "macos-14" - platform: "macos" - min_macos_version: "14" - platform_id: "macosx_arm64" + # - name: "macos-13" + # platform: "macos" + # min_macos_version: "13" + # platform_id: "macosx_x86_64" - - name: "windows-latest" - platform: "windows" - platform_id: "win_amd64" + # - name: "macos-14" + # platform: "macos" + # min_macos_version: "14" + # platform_id: "macosx_arm64" + + # - name: "windows-latest" + # platform: "windows" + # platform_id: "win_amd64" steps: - name: Checkout @@ -211,10 +218,10 @@ jobs: if: matrix.os.name == 'ubuntu-latest' env: # CIBW_BUILD: ${{ env.python_cp_version }}-${{ matrix.os.platform_id }} - CIBW_ARCHS: auto x86_64 aarch64 + CIBW_ARCHS: "${{ matrix.os.arch }}" CIBW_PLATFORM: linux CIBW_SKIP: "pp* *musllinux_* *_i686* *_s390* *pypy*" - CIBW_PROJECT_REQUIRES_PYTHON: "~=${{ matrix.python-version }}.0" + CIBW_PROJECT_REQUIRES_PYTHON: ">=3.9.0" CIBW_BUILD_VERBOSITY: 3 BUILD_THREADS: "8" run: | From d3d9558022fe43a12172ae2f4f5dc23a01258b8d Mon Sep 17 00:00:00 2001 From: Michele Dolfi Date: Sun, 26 Jan 2025 11:11:36 +0100 Subject: [PATCH 3/4] use ubuntu-22.04 Signed-off-by: Michele Dolfi --- .github/workflows/wheels.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index b9eb4528..b4708726 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -45,12 +45,12 @@ jobs: python-version: ["3.11"] os: - - name: "ubuntu-latest" + - name: "ubuntu-22.04" platform: "linux" arch: "x86_64" platform_id: "manylinux_x86_64" - - name: "ubuntu-latest" + - name: "ubuntu-22.04" platform: "linux" arch: "aarch64" platform_id: "manylinux_x86_64" @@ -209,13 +209,13 @@ jobs: cp wheelhouse/*.whl ./dist/ - name: Set up QEMU [linux] - if: matrix.os.name == 'ubuntu-latest' + if: matrix.os.name == 'ubuntu-22.04' uses: docker/setup-qemu-action@v3 with: platforms: all - name: Build wheels [linux] - if: matrix.os.name == 'ubuntu-latest' + if: matrix.os.name == 'ubuntu-22.04' env: # CIBW_BUILD: ${{ env.python_cp_version }}-${{ matrix.os.platform_id }} CIBW_ARCHS: "${{ matrix.os.arch }}" From db7f13ecdfe9c10c632ba2a1586bb01b5765749c Mon Sep 17 00:00:00 2001 From: Michele Dolfi Date: Sun, 26 Jan 2025 11:25:37 +0100 Subject: [PATCH 4/4] checks Signed-off-by: Michele Dolfi --- .github/workflows/checks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index a9ab7689..9ab6d012 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -6,7 +6,7 @@ env: jobs: run-checks: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 strategy: matrix: python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]