Skip to content

Commit 6bf562a

Browse files
committed
Merge branch 'maintenance/gha-cibuildwheel-linux' into devel
2 parents 9c85bce + 9452f2c commit 6bf562a

File tree

11 files changed

+73
-664
lines changed

11 files changed

+73
-664
lines changed

.github/workflows/ci-cd.yml

Lines changed: 29 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -675,83 +675,28 @@ jobs:
675675
!fromJSON(needs.pre-setup.outputs.is-untagged-devel)
676676
&& !fromJSON(needs.pre-setup.outputs.release-requested)
677677
) && 'test' || ''
678-
}}] manylinux
678+
}}] manylinux [tested]
679679
needs:
680680
- build-src
681681
- pre-setup # transitive, for accessing settings
682-
strategy:
683-
matrix:
684-
manylinux-python-target:
685-
# NOTE: Must be from this list:
686-
# NOTE: $ podman run -it --rm \
687-
# NOTE: quay.io/pypa/manylinux2014_x86_64 \
688-
# NOTE: ls -1 /opt/python
689-
- cp38-cp38
690-
- cp39-cp39
691-
- cp310-cp310
692-
- cp311-cp311
693-
- cp312-cp312
694-
manylinux-year-target:
695-
- 2014
696-
- _2_24
697-
- _2_28
698-
manylinux-image-target:
699-
# NOTE: Keep in sync with `build-manylinux-container-images.yml`.
700-
# NOTE: Ordered from "heavy" to "fast".
701-
- arch: x86_64
702-
qemu_arch: amd64
703-
include:
704-
# NOTE: manylinux2010 only on x86_64
705-
- manylinux-python-target: cp38-cp38
706-
manylinux-image-target:
707-
arch: x86_64
708-
qemu_arch: amd64
709-
manylinux-year-target: 2010
710-
- manylinux-python-target: cp39-cp39
711-
manylinux-image-target:
712-
arch: x86_64
713-
qemu_arch: amd64
714-
manylinux-year-target: 2010
715-
- manylinux-python-target: cp310-cp310
716-
manylinux-image-target:
717-
arch: x86_64
718-
qemu_arch: amd64
719-
manylinux-year-target: 2010
720-
# NOTE: manylinux1 caps out at Python 3.9
721-
- manylinux-python-target: cp38-cp38
722-
manylinux-image-target:
723-
arch: x86_64
724-
qemu_arch: amd64
725-
manylinux-year-target: 1
726-
- manylinux-python-target: cp39-cp39
727-
manylinux-image-target:
728-
arch: x86_64
729-
qemu_arch: amd64
730-
manylinux-year-target: 1
731-
exclude:
732-
# NOTE: cp312-cp312 unavailable before _2_28
733-
- manylinux-python-target: cp312-cp312
734-
manylinux-year-target: 2014
735-
- manylinux-python-target: cp312-cp312
736-
manylinux-year-target: _2_24
737-
738-
uses: ./.github/workflows/reusable-build-wheel.yml
682+
uses: ./.github/workflows/reusable-cibuildwheel.yml
739683
with:
740-
# qemu: ${{ matrix.qemu }}
684+
os: ubuntu-latest
685+
wheel-tags-to-skip: >-
686+
*_i686
687+
*-musllinux_*
688+
*-*linux_{aarch64,ppc64le,s390x}
689+
pp*
741690
source-tarball-name: >-
742691
${{ needs.pre-setup.outputs.sdist-artifact-name }}
743692
dists-artifact-name: >-
744693
${{ needs.pre-setup.outputs.dists-artifact-name }}
745-
wheel-artifact-name: ${{ needs.pre-setup.outputs.wheel-artifact-name }}
746-
cache-key-files: ${{ needs.pre-setup.outputs.cache-key-files }}
747-
release-requested: >-
748-
${{ needs.pre-setup.outputs.release-requested }}
749-
manylinux-python-target: ${{ matrix.manylinux-python-target }}
750-
manylinux-year-target: ${{ matrix.manylinux-year-target }}
751-
manylinux-image-target-arch: >-
752-
${{ matrix.manylinux-image-target.arch }}
753-
manylinux-image-target-qemu-arch: >-
754-
${{ matrix.manylinux-image-target.qemu_arch }}
694+
cython-tracing: >- # Cython line tracing for coverage collection
695+
${{
696+
fromJSON(needs.pre-setup.outputs.profiling-enabled)
697+
&& 'true'
698+
|| 'false'
699+
}}
755700
756701
build-bin-manylinux-odd-arches:
757702
name: >-
@@ -767,57 +712,29 @@ jobs:
767712
!fromJSON(needs.pre-setup.outputs.is-untagged-devel)
768713
&& !fromJSON(needs.pre-setup.outputs.release-requested)
769714
) && 'test' || ''
770-
}}] manylinux
715+
}}] manylinux [odd]
771716
needs:
772717
- build-src
773718
- pre-setup # transitive, for accessing settings
774-
strategy:
775-
matrix:
776-
manylinux-python-target:
777-
# NOTE: Must be from this list:
778-
# NOTE: $ podman run -it --rm \
779-
# NOTE: quay.io/pypa/manylinux2014_x86_64 \
780-
# NOTE: ls -1 /opt/python
781-
- cp38-cp38
782-
- cp39-cp39
783-
- cp310-cp310
784-
- cp311-cp311
785-
- cp312-cp312
786-
manylinux-year-target:
787-
- 2014
788-
- _2_24
789-
- _2_28
790-
manylinux-image-target:
791-
# NOTE: Keep in sync with `build-manylinux-container-images.yml`.
792-
# NOTE: Ordered from "heavy" to "fast".
793-
- arch: aarch64
794-
qemu_arch: arm64
795-
- arch: s390x
796-
- arch: ppc64le
797-
exclude:
798-
# NOTE: cp312-cp312 unavailable before _2_28
799-
- manylinux-python-target: cp312-cp312
800-
manylinux-year-target: 2014
801-
- manylinux-python-target: cp312-cp312
802-
manylinux-year-target: _2_24
803-
804-
uses: ./.github/workflows/reusable-build-wheel.yml
719+
uses: ./.github/workflows/reusable-cibuildwheel.yml
805720
with:
806-
# qemu: ${{ matrix.qemu }}
721+
os: ubuntu-latest
722+
wheel-tags-to-skip: >-
723+
*_i686
724+
*-musllinux_*
725+
*-*linux_x86_64
726+
pp*
807727
source-tarball-name: >-
808728
${{ needs.pre-setup.outputs.sdist-artifact-name }}
809729
dists-artifact-name: >-
810730
${{ needs.pre-setup.outputs.dists-artifact-name }}
811-
wheel-artifact-name: ${{ needs.pre-setup.outputs.wheel-artifact-name }}
812-
cache-key-files: ${{ needs.pre-setup.outputs.cache-key-files }}
813-
release-requested: >-
814-
${{ needs.pre-setup.outputs.release-requested }}
815-
manylinux-python-target: ${{ matrix.manylinux-python-target }}
816-
manylinux-year-target: ${{ matrix.manylinux-year-target }}
817-
manylinux-image-target-arch: >-
818-
${{ matrix.manylinux-image-target.arch }}
819-
manylinux-image-target-qemu-arch: >-
820-
${{ matrix.manylinux-image-target.qemu_arch }}
731+
qemu: all
732+
cython-tracing: >- # Cython line tracing for coverage collection
733+
${{
734+
fromJSON(needs.pre-setup.outputs.profiling-enabled)
735+
&& 'true'
736+
|| 'false'
737+
}}
821738
822739
build-src:
823740
name: >-

.github/workflows/reusable-build-wheel.yml

Lines changed: 0 additions & 223 deletions
This file was deleted.

0 commit comments

Comments
 (0)