From 3c442e5fde5877cd34a457a63685b85286fc0f0b Mon Sep 17 00:00:00 2001 From: scaramallion Date: Mon, 17 Jun 2024 11:31:00 +1000 Subject: [PATCH 1/2] Test building arm64 wheels --- .github/workflows/release-wheels.yml | 157 ++++++++++++++------------- 1 file changed, 79 insertions(+), 78 deletions(-) diff --git a/.github/workflows/release-wheels.yml b/.github/workflows/release-wheels.yml index 2bcad39..05069df 100644 --- a/.github/workflows/release-wheels.yml +++ b/.github/workflows/release-wheels.yml @@ -1,11 +1,11 @@ name: release-deploy on: - release: - types: [ published ] + # release: + # types: [ published ] # push: # branches: [ main ] - # pull_request: + pull_request: jobs: build-sdist: @@ -42,77 +42,77 @@ jobs: matrix: include: # Windows 32 bit - - os: windows-latest - python: 38 - platform_id: win32 - - os: windows-latest - python: 39 - platform_id: win32 - - os: windows-latest - python: 310 - platform_id: win32 - - os: windows-latest - python: 311 - platform_id: win32 - - os: windows-latest - python: 312 - platform_id: win32 - - # Windows 64 bit - - os: windows-latest - python: 38 - platform_id: win_amd64 - - os: windows-latest - python: 39 - platform_id: win_amd64 - - os: windows-latest - python: 310 - platform_id: win_amd64 - - os: windows-latest - python: 311 - platform_id: win_amd64 - - os: windows-latest - python: 312 - platform_id: win_amd64 - - # Linux 64 bit manylinux2014 - - os: ubuntu-latest - python: 38 - platform_id: manylinux_x86_64 - manylinux_image: manylinux2014 - - os: ubuntu-latest - python: 39 - platform_id: manylinux_x86_64 - manylinux_image: manylinux2014 - - os: ubuntu-latest - python: 310 - platform_id: manylinux_x86_64 - manylinux_image: manylinux2014 - - os: ubuntu-latest - python: 311 - platform_id: manylinux_x86_64 - manylinux_image: manylinux2014 - - os: ubuntu-latest - python: 312 - platform_id: manylinux_x86_64 - manylinux_image: manylinux2014 - - # Linux aarch64 - - os: ubuntu-latest - python: 38 - platform_id: manylinux_aarch64 - - os: ubuntu-latest - python: 39 - platform_id: manylinux_aarch64 - - os: ubuntu-latest - python: 310 - platform_id: manylinux_aarch64 - - os: ubuntu-latest - python: 311 - platform_id: manylinux_aarch64 - - os: ubuntu-latest - python: 312 - platform_id: manylinux_aarch64 + # - os: windows-latest + # python: 38 + # platform_id: win32 + # - os: windows-latest + # python: 39 + # platform_id: win32 + # - os: windows-latest + # python: 310 + # platform_id: win32 + # - os: windows-latest + # python: 311 + # platform_id: win32 + # - os: windows-latest + # python: 312 + # platform_id: win32 + # + # # Windows 64 bit + # - os: windows-latest + # python: 38 + # platform_id: win_amd64 + # - os: windows-latest + # python: 39 + # platform_id: win_amd64 + # - os: windows-latest + # python: 310 + # platform_id: win_amd64 + # - os: windows-latest + # python: 311 + # platform_id: win_amd64 + # - os: windows-latest + # python: 312 + # platform_id: win_amd64 + # + # # Linux 64 bit manylinux2014 + # - os: ubuntu-latest + # python: 38 + # platform_id: manylinux_x86_64 + # manylinux_image: manylinux2014 + # - os: ubuntu-latest + # python: 39 + # platform_id: manylinux_x86_64 + # manylinux_image: manylinux2014 + # - os: ubuntu-latest + # python: 310 + # platform_id: manylinux_x86_64 + # manylinux_image: manylinux2014 + # - os: ubuntu-latest + # python: 311 + # platform_id: manylinux_x86_64 + # manylinux_image: manylinux2014 + # - os: ubuntu-latest + # python: 312 + # platform_id: manylinux_x86_64 + # manylinux_image: manylinux2014 + # + # # Linux aarch64 + # - os: ubuntu-latest + # python: 38 + # platform_id: manylinux_aarch64 + # - os: ubuntu-latest + # python: 39 + # platform_id: manylinux_aarch64 + # - os: ubuntu-latest + # python: 310 + # platform_id: manylinux_aarch64 + # - os: ubuntu-latest + # python: 311 + # platform_id: manylinux_aarch64 + # - os: ubuntu-latest + # python: 312 + # platform_id: manylinux_aarch64 # MacOS 12 x86_64 - os: macos-12 @@ -218,10 +218,11 @@ jobs: # Cross compiling wheels for arm64 with poetry creates wheels with wrong tag # Update the wheel with the correct tag then remove the incorrect wheel - - name: Fix poetry mistagging - run: | - wheel tags --platform-tag macosx_14_0_arm64 ./dist/*-macosx_14_0_x86_64.whl - rm ./dist/*-macosx_14_0_x86_64.whl + # - name: Fix poetry mistagging + # run: | + # ls -l ./dist/ + # wheel tags --platform-tag macosx_14_0_arm64 ./dist/*-macosx_14_0_x86_64.whl + # rm ./dist/*-macosx_14_0_x86_64.whl - name: Store artifacts uses: actions/upload-artifact@v4 From 649c02aa0329e9eef1be63661ec8e91c0728b98c Mon Sep 17 00:00:00 2001 From: scaramallion Date: Mon, 17 Jun 2024 11:35:29 +1000 Subject: [PATCH 2/2] Finalise --- .github/workflows/release-wheels.yml | 156 +++++++++++++-------------- 1 file changed, 74 insertions(+), 82 deletions(-) diff --git a/.github/workflows/release-wheels.yml b/.github/workflows/release-wheels.yml index 05069df..6fa6ec9 100644 --- a/.github/workflows/release-wheels.yml +++ b/.github/workflows/release-wheels.yml @@ -1,11 +1,11 @@ name: release-deploy on: - # release: - # types: [ published ] + release: + types: [ published ] # push: # branches: [ main ] - pull_request: + # pull_request: jobs: build-sdist: @@ -42,77 +42,77 @@ jobs: matrix: include: # Windows 32 bit - # - os: windows-latest - # python: 38 - # platform_id: win32 - # - os: windows-latest - # python: 39 - # platform_id: win32 - # - os: windows-latest - # python: 310 - # platform_id: win32 - # - os: windows-latest - # python: 311 - # platform_id: win32 - # - os: windows-latest - # python: 312 - # platform_id: win32 - # - # # Windows 64 bit - # - os: windows-latest - # python: 38 - # platform_id: win_amd64 - # - os: windows-latest - # python: 39 - # platform_id: win_amd64 - # - os: windows-latest - # python: 310 - # platform_id: win_amd64 - # - os: windows-latest - # python: 311 - # platform_id: win_amd64 - # - os: windows-latest - # python: 312 - # platform_id: win_amd64 - # - # # Linux 64 bit manylinux2014 - # - os: ubuntu-latest - # python: 38 - # platform_id: manylinux_x86_64 - # manylinux_image: manylinux2014 - # - os: ubuntu-latest - # python: 39 - # platform_id: manylinux_x86_64 - # manylinux_image: manylinux2014 - # - os: ubuntu-latest - # python: 310 - # platform_id: manylinux_x86_64 - # manylinux_image: manylinux2014 - # - os: ubuntu-latest - # python: 311 - # platform_id: manylinux_x86_64 - # manylinux_image: manylinux2014 - # - os: ubuntu-latest - # python: 312 - # platform_id: manylinux_x86_64 - # manylinux_image: manylinux2014 - # - # # Linux aarch64 - # - os: ubuntu-latest - # python: 38 - # platform_id: manylinux_aarch64 - # - os: ubuntu-latest - # python: 39 - # platform_id: manylinux_aarch64 - # - os: ubuntu-latest - # python: 310 - # platform_id: manylinux_aarch64 - # - os: ubuntu-latest - # python: 311 - # platform_id: manylinux_aarch64 - # - os: ubuntu-latest - # python: 312 - # platform_id: manylinux_aarch64 + - os: windows-latest + python: 38 + platform_id: win32 + - os: windows-latest + python: 39 + platform_id: win32 + - os: windows-latest + python: 310 + platform_id: win32 + - os: windows-latest + python: 311 + platform_id: win32 + - os: windows-latest + python: 312 + platform_id: win32 + + # Windows 64 bit + - os: windows-latest + python: 38 + platform_id: win_amd64 + - os: windows-latest + python: 39 + platform_id: win_amd64 + - os: windows-latest + python: 310 + platform_id: win_amd64 + - os: windows-latest + python: 311 + platform_id: win_amd64 + - os: windows-latest + python: 312 + platform_id: win_amd64 + + # Linux 64 bit manylinux2014 + - os: ubuntu-latest + python: 38 + platform_id: manylinux_x86_64 + manylinux_image: manylinux2014 + - os: ubuntu-latest + python: 39 + platform_id: manylinux_x86_64 + manylinux_image: manylinux2014 + - os: ubuntu-latest + python: 310 + platform_id: manylinux_x86_64 + manylinux_image: manylinux2014 + - os: ubuntu-latest + python: 311 + platform_id: manylinux_x86_64 + manylinux_image: manylinux2014 + - os: ubuntu-latest + python: 312 + platform_id: manylinux_x86_64 + manylinux_image: manylinux2014 + + # Linux aarch64 + - os: ubuntu-latest + python: 38 + platform_id: manylinux_aarch64 + - os: ubuntu-latest + python: 39 + platform_id: manylinux_aarch64 + - os: ubuntu-latest + python: 310 + platform_id: manylinux_aarch64 + - os: ubuntu-latest + python: 311 + platform_id: manylinux_aarch64 + - os: ubuntu-latest + python: 312 + platform_id: manylinux_aarch64 # MacOS 12 x86_64 - os: macos-12 @@ -216,14 +216,6 @@ jobs: run: | python -m cibuildwheel --output-dir dist - # Cross compiling wheels for arm64 with poetry creates wheels with wrong tag - # Update the wheel with the correct tag then remove the incorrect wheel - # - name: Fix poetry mistagging - # run: | - # ls -l ./dist/ - # wheel tags --platform-tag macosx_14_0_arm64 ./dist/*-macosx_14_0_x86_64.whl - # rm ./dist/*-macosx_14_0_x86_64.whl - - name: Store artifacts uses: actions/upload-artifact@v4 with: