diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index 7116cf10b..a03889a21 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -795,6 +795,7 @@ jobs: manylinux-year-target: - 2014 - _2_24 + - _2_28 manylinux-image-target: # NOTE: Keep in sync with `build-manylinux-container-images.yml`. # NOTE: Ordered from "heavy" to "fast". @@ -828,6 +829,12 @@ jobs: arch: x86_64 qemu_arch: amd64 manylinux-year-target: 1 + exclude: + # NOTE: cp312-cp312 unavailable before _2_28 + - manylinux-python-target: cp312-cp312 + manylinux-year-target: 2014 + - manylinux-python-target: cp312-cp312 + manylinux-year-target: _2_24 env: ANSIBLE_PYLIBSSH_TRACING: >- @@ -988,6 +995,7 @@ jobs: manylinux-year-target: - 2014 - _2_24 + - _2_28 manylinux-image-target: # NOTE: Keep in sync with `build-manylinux-container-images.yml`. # NOTE: Ordered from "heavy" to "fast". @@ -995,6 +1003,12 @@ jobs: qemu_arch: arm64 - arch: s390x - arch: ppc64le + exclude: + # NOTE: cp312-cp312 unavailable before _2_28 + - manylinux-python-target: cp312-cp312 + manylinux-year-target: 2014 + - manylinux-python-target: cp312-cp312 + manylinux-year-target: _2_24 env: ANSIBLE_PYLIBSSH_TRACING: >- diff --git a/tox.ini b/tox.ini index 808a1d585..82c339a7e 100644 --- a/tox.ini +++ b/tox.ini @@ -235,7 +235,7 @@ description = Verify that dists under the dist/ dir have valid metadata depends = build-dists - build-dists-manylinux{1,2010,2014,_2_24}-{x86_64,i686,aarch64,armv7l,ppc64,ppc64le,s390x} + build-dists-manylinux{1,2010,2014,_2_24,_2_28}-{x86_64,aarch64,ppc64le,s390x} build-wheels-pip delocate-macos-wheels deps = @@ -250,7 +250,7 @@ commands = twine check --strict {env:PEP517_OUT_DIR}/* -[testenv:build-dists-manylinux{1,2010,2014,_2_24}-{x86_64,i686,aarch64,armv7l,ppc64,ppc64le,s390x}] +[testenv:build-dists-manylinux{1,2010,2014,_2_24,_2_28}-{x86_64,aarch64,ppc64le,s390x}] allowlist_externals = {env:DOCKER_EXECUTABLE:docker} basepython = python3 @@ -278,10 +278,7 @@ setenv = {[testenv]setenv} x86_64: MANYLINUX_ARCH_TAG = x86_64 - i686: MANYLINUX_ARCH_TAG = i686 aarch64: MANYLINUX_ARCH_TAG = aarch64 - armv7l: MANYLINUX_ARCH_TAG = armv7l - ppc64: MANYLINUX_ARCH_TAG = ppc64 ppc64le: MANYLINUX_ARCH_TAG = ppc64le s390x: MANYLINUX_ARCH_TAG = s390x @@ -289,6 +286,7 @@ setenv = manylinux2010: MANYLINUX_VERSION_TAG = 2010 manylinux2014: MANYLINUX_VERSION_TAG = 2014 manylinux_2_24: MANYLINUX_VERSION_TAG = _2_24 + manylinux_2_28: MANYLINUX_VERSION_TAG = _2_28 skip_install = true