From 455b71362b81e2a5e657aeeede4306b653cbe14b Mon Sep 17 00:00:00 2001 From: Oscar Higgott Date: Sat, 15 Apr 2023 23:36:53 +0100 Subject: [PATCH 1/5] add manylinux_aarch64 wheels to CI --- .github/workflows/ci.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 62909aa5d..fa6921dd6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -106,6 +106,14 @@ jobs: # {os: ubuntu-latest, dist: cp39-musllinux_i686}, # {os: ubuntu-latest, dist: cp310-musllinux_i686}, # {os: ubuntu-latest, dist: cp311-musllinux_i686}, + + # manylinux_aarch64 + {os: ubuntu-latest, dist: cp36-manylinux_aarch64}, + {os: ubuntu-latest, dist: cp37-manylinux_aarch64}, + {os: ubuntu-latest, dist: cp38-manylinux_aarch64}, + {os: ubuntu-latest, dist: cp39-manylinux_aarch64}, + {os: ubuntu-latest, dist: cp310-manylinux_aarch64}, + {os: ubuntu-latest, dist: cp311-manylinux_aarch64}, ] steps: - uses: actions/checkout@v3 From eaee35c99d767a738d96b27616d7b224638a2617 Mon Sep 17 00:00:00 2001 From: Oscar Higgott Date: Sun, 16 Apr 2023 08:14:28 +0100 Subject: [PATCH 2/5] Add qemu for linux builds --- .github/workflows/ci.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fa6921dd6..e2a7b5efb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,6 +33,7 @@ jobs: MACOSX_DEPLOYMENT_TARGET: "10.15" CIBW_BUILD: "${{ matrix.os_dist.dist }}" CIBW_ARCHS_MACOS: "x86_64 universal2 arm64" + CIBW_ARCHS_LINUX: auto aarch64 ppc64le s390x CIBW_BEFORE_BUILD: pip install --upgrade ninja CIBW_TEST_REQUIRES: pytest stim~=1.10.dev1666411378 CIBW_TEST_COMMAND: pytest {project}/tests @@ -120,6 +121,12 @@ jobs: with: submodules: true + - name: Set up QEMU + if: runner.os == 'Linux' + uses: docker/setup-qemu-action@v2 + with: + platforms: all + - name: Install g++ if: runner.os == 'Linux' run: | From 91e21c626440497beb7742b0167084954a7b3232 Mon Sep 17 00:00:00 2001 From: Oscar Higgott Date: Sun, 16 Apr 2023 08:37:39 +0100 Subject: [PATCH 3/5] bump cibw version --- .github/workflows/ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e2a7b5efb..fd512550d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,7 +33,7 @@ jobs: MACOSX_DEPLOYMENT_TARGET: "10.15" CIBW_BUILD: "${{ matrix.os_dist.dist }}" CIBW_ARCHS_MACOS: "x86_64 universal2 arm64" - CIBW_ARCHS_LINUX: auto aarch64 ppc64le s390x +# CIBW_ARCHS_LINUX: auto aarch64 ppc64le s390x CIBW_BEFORE_BUILD: pip install --upgrade ninja CIBW_TEST_REQUIRES: pytest stim~=1.10.dev1666411378 CIBW_TEST_COMMAND: pytest {project}/tests @@ -120,12 +120,12 @@ jobs: - uses: actions/checkout@v3 with: submodules: true - - - name: Set up QEMU - if: runner.os == 'Linux' - uses: docker/setup-qemu-action@v2 - with: - platforms: all +# +# - name: Set up QEMU +# if: runner.os == 'Linux' +# uses: docker/setup-qemu-action@v2 +# with: +# platforms: all - name: Install g++ if: runner.os == 'Linux' @@ -133,7 +133,7 @@ jobs: sudo apt update sudo apt install gcc-10 g++-10 - - uses: pypa/cibuildwheel@v2.11.1 + - uses: pypa/cibuildwheel@v2.12.1 - name: Verify clean directory run: git diff --exit-code From fb02476a77ce09425f17e536e681469285e22e84 Mon Sep 17 00:00:00 2001 From: Oscar Higgott Date: Sun, 16 Apr 2023 08:55:59 +0100 Subject: [PATCH 4/5] add back qemu --- .github/workflows/ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fd512550d..51bab8382 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,7 @@ jobs: env: MACOSX_DEPLOYMENT_TARGET: "10.15" CIBW_BUILD: "${{ matrix.os_dist.dist }}" - CIBW_ARCHS_MACOS: "x86_64 universal2 arm64" +# CIBW_ARCHS_MACOS: "x86_64 universal2 arm64" # CIBW_ARCHS_LINUX: auto aarch64 ppc64le s390x CIBW_BEFORE_BUILD: pip install --upgrade ninja CIBW_TEST_REQUIRES: pytest stim~=1.10.dev1666411378 @@ -121,11 +121,11 @@ jobs: with: submodules: true # -# - name: Set up QEMU -# if: runner.os == 'Linux' -# uses: docker/setup-qemu-action@v2 -# with: -# platforms: all + - name: Set up QEMU + if: runner.os == 'Linux' + uses: docker/setup-qemu-action@v2 + with: + platforms: all - name: Install g++ if: runner.os == 'Linux' From b0f89894588cc687821b1b49da63614ad2700d86 Mon Sep 17 00:00:00 2001 From: Oscar Higgott Date: Sun, 16 Apr 2023 09:16:29 +0100 Subject: [PATCH 5/5] Add CIBW_ARCHS_LINUX and CIBW_ARCHS_MACOS --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 51bab8382..5abed4705 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,8 +32,8 @@ jobs: env: MACOSX_DEPLOYMENT_TARGET: "10.15" CIBW_BUILD: "${{ matrix.os_dist.dist }}" -# CIBW_ARCHS_MACOS: "x86_64 universal2 arm64" -# CIBW_ARCHS_LINUX: auto aarch64 ppc64le s390x + CIBW_ARCHS_MACOS: "x86_64 universal2 arm64" + CIBW_ARCHS_LINUX: auto aarch64 ppc64le s390x CIBW_BEFORE_BUILD: pip install --upgrade ninja CIBW_TEST_REQUIRES: pytest stim~=1.10.dev1666411378 CIBW_TEST_COMMAND: pytest {project}/tests