From 0d7cd2269e87f636b2d2bef4fa463db19e2c6c9d Mon Sep 17 00:00:00 2001 From: Revathyvenugopal162 Date: Thu, 11 Jul 2024 18:03:00 +0200 Subject: [PATCH 1/4] fix: update the actions for build-ci wheels --- build-ci-wheels/action.yml | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/build-ci-wheels/action.yml b/build-ci-wheels/action.yml index 510a34358..7d060630b 100644 --- a/build-ci-wheels/action.yml +++ b/build-ci-wheels/action.yml @@ -91,30 +91,19 @@ runs: platforms: arm64 - name: "Build wheels for CPython ${{ inputs.python-version }}" - if: ${{ inputs.cibw-build != 'cp38-*' && inputs.requires-pypy == 'false' }} - uses: pypa/cibuildwheel@v2.16.2 + if: ${{ inputs.requires-pypy == 'false' }} + uses: pypa/cibuildwheel@v2.19.2 env: CIBW_BUILD: ${{ inputs.cibw-build }} - CIBW_SKIP: ${{ inputs.cibw-skip }} CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014 CIBW_MANYLINUX_I686_IMAGE: manylinux2014 CIBW_ARCHS: ${{ inputs.cibw-archs }} - - name: "Build wheels for CPython 3.8" - if: ${{ inputs.cibw-build == 'cp38-*' && inputs.requires-pypy == 'false' }} - uses: pypa/cibuildwheel@v2.16.2 - env: - CIBW_BUILD: ${{ inputs.cibw-build }} - CIBW_SKIP: ${{ inputs.cibw-skip }} - CIBW_MANYLINUX_X86_64_IMAGE: manylinux2010 - CIBW_MANYLINUX_I686_IMAGE: manylinux2010 - CIBW_ARCHS: ${{ inputs.cibw-archs }} - - name: "Build wheels for PyPy" if: ${{ inputs.requires-pypy == 'true' && inputs.cibw-archs != 'aarch64' }} - uses: pypa/cibuildwheel@v2.16.2 + uses: pypa/cibuildwheel@v2.19.2 env: - CIBW_BUILD: "pp38-* pp39-*" + CIBW_BUILD: "pp39-*" CIBW_SKIP: ${{ inputs.cibw-skip }} CIBW_ARCHS: ${{ inputs.cibw-archs }} From 02045ee647d7c9f2226aadd4bfa0050d16c5c195 Mon Sep 17 00:00:00 2001 From: Revathyvenugopal162 Date: Thu, 11 Jul 2024 20:24:23 +0200 Subject: [PATCH 2/4] fix: remove skip input --- build-ci-wheels/action.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/build-ci-wheels/action.yml b/build-ci-wheels/action.yml index 7d060630b..199bd9f88 100644 --- a/build-ci-wheels/action.yml +++ b/build-ci-wheels/action.yml @@ -54,13 +54,6 @@ inputs: required: false type: string - cibw-skip: - description: > - Desired conditions to skip when building the wheels. - default: "*-musllinux*" - required: false - type: string - cibw-archs: description: > Desired build architecture. From b283749577e8f034474eaeff7e6ac1f06d0d4934 Mon Sep 17 00:00:00 2001 From: Revathyvenugopal162 Date: Thu, 11 Jul 2024 20:41:44 +0200 Subject: [PATCH 3/4] fix: artifact name --- build-ci-wheels/action.yml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/build-ci-wheels/action.yml b/build-ci-wheels/action.yml index 199bd9f88..f9bcd36ee 100644 --- a/build-ci-wheels/action.yml +++ b/build-ci-wheels/action.yml @@ -45,6 +45,20 @@ inputs: required: true type: string + library-name: + description: > + Name of the Python library. This is the name used when uploading the wheel + and source distribution as artifacts. The name should be the same one used + in the PyPI index. + required: true + type: string + + operating-system: + description: > + Name of the operating system where the library is installed. + required: true + type: string + # Optional inputs cibw-build: @@ -103,6 +117,6 @@ runs: - name: "Upload wheel" uses: actions/upload-artifact@v4 with: - name: wheels + name: ${{ inputs.library-name }}-{{ inputs.operating-system }}-{{ inputs.python-version }}-wheels path: ./wheelhouse/*.whl retention-days: 7 From f1f1b9e7750ca46a24c5ac8a2d748b11ec2972d2 Mon Sep 17 00:00:00 2001 From: Revathyvenugopal162 Date: Thu, 11 Jul 2024 21:33:28 +0200 Subject: [PATCH 4/4] fix: artifact name --- build-ci-wheels/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-ci-wheels/action.yml b/build-ci-wheels/action.yml index f9bcd36ee..3cc34e1cf 100644 --- a/build-ci-wheels/action.yml +++ b/build-ci-wheels/action.yml @@ -117,6 +117,6 @@ runs: - name: "Upload wheel" uses: actions/upload-artifact@v4 with: - name: ${{ inputs.library-name }}-{{ inputs.operating-system }}-{{ inputs.python-version }}-wheels + name: ${{ inputs.library-name }}-${{ inputs.operating-system }}-${{ inputs.python-version }}-wheels path: ./wheelhouse/*.whl retention-days: 7