Skip to content

Commit 0087d82

Browse files
committed
feat: add manylinux_2_28_i686
1 parent c1ce95b commit 0087d82

File tree

5 files changed

+10
-4
lines changed

5 files changed

+10
-4
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
reduced = [
5454
("x86_64", "ubuntu-24.04", ("manylinux2014", "manylinux_2_28", "manylinux_2_34", "musllinux_1_2")),
5555
("aarch64", "ubuntu-24.04-arm", ("manylinux2014", "manylinux_2_28", "manylinux_2_34", "musllinux_1_2")),
56-
("i686", "ubuntu-24.04", ("manylinux2014", "musllinux_1_2")),
56+
("i686", "ubuntu-24.04", ("manylinux2014", "manylinux_2_28", "musllinux_1_2")),
5757
("armv7l", "ubuntu-24.04-arm", ("manylinux_2_31", "musllinux_1_2")),
5858
("s390x", "ubuntu-24.04", ("musllinux_1_2",)),
5959
]

README.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ The manylinux project supports:
3434

3535
- ``manylinux2014`` images for ``x86_64``, ``i686``, ``aarch64``, ``ppc64le`` and ``s390x``.
3636

37-
- ``manylinux_2_28`` images for ``x86_64``, ``aarch64``, ``ppc64le`` and ``s390x``.
37+
- ``manylinux_2_28`` images for ``x86_64``, ``i686``, ``aarch64``, ``ppc64le`` and ``s390x``.
3838

3939
- ``manylinux_2_34`` images for ``x86_64``, ``aarch64``, ``ppc64le`` and ``s390x``.
4040

@@ -157,6 +157,7 @@ manylinux_2_28 (AlmaLinux 8 based)
157157
Toolchain: GCC 14
158158

159159
- x86_64 image: ``quay.io/pypa/manylinux_2_28_x86_64``
160+
- i686 image: ``quay.io/pypa/manylinux_2_28_i686``
160161
- aarch64 image: ``quay.io/pypa/manylinux_2_28_aarch64``
161162
- ppc64le image: ``quay.io/pypa/manylinux_2_28_ppc64le``
162163
- s390x image: ``quay.io/pypa/manylinux_2_28_s390x``

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ if [ "${POLICY}" == "manylinux2014" ]; then
3434
LD_LIBRARY_PATH_ARG="${DEVTOOLSET_ROOTPATH}/usr/lib64:${DEVTOOLSET_ROOTPATH}/usr/lib:${DEVTOOLSET_ROOTPATH}/usr/lib64/dyninst:${DEVTOOLSET_ROOTPATH}/usr/lib/dyninst:/usr/local/lib64"
3535
fi
3636
elif [ "${POLICY}" == "manylinux_2_28" ]; then
37-
BASEIMAGE="almalinux:8"
37+
BASEIMAGE="quay.io/almalinuxorg/almalinux:8"
3838
DEVTOOLSET_ROOTPATH="/opt/rh/gcc-toolset-14/root"
3939
PREPEND_PATH="${DEVTOOLSET_ROOTPATH}/usr/bin:"
4040
LD_LIBRARY_PATH_ARG="${DEVTOOLSET_ROOTPATH}/usr/lib64:${DEVTOOLSET_ROOTPATH}/usr/lib:${DEVTOOLSET_ROOTPATH}/usr/lib64/dyninst:${DEVTOOLSET_ROOTPATH}/usr/lib/dyninst"

deploy_multiarch.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ for IMAGE in "${IMAGES[@]}"; do
3232

3333
case ${IMAGE} in
3434
manylinux_2_31) ARCHS=("armv7l");;
35+
manylinux_2_28) ARCHS=("x86_64" "i686" "aarch64" "ppc64le" "s390x");;
3536
manylinux2014) ARCHS=("x86_64" "i686" "aarch64" "ppc64le" "s390x");;
3637
musllinux_1_2) ARCHS=("x86_64" "i686" "aarch64" "armv7l" "ppc64le" "s390x");;
3738
*) ARCHS=("x86_64" "aarch64" "ppc64le" "s390x");;

docker/build_scripts/install-runtime-packages.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,11 @@ elif [ "${OS_ID_LIKE}" == "rhel" ]; then
119119
BASE_TOOLS+=(glibc-locale-source glibc-langpack-en hardlink hostname libcurl libnsl libxcrypt which)
120120
echo "tsflags=nodocs" >> /etc/dnf/dnf.conf
121121
dnf -y upgrade
122-
dnf -y install dnf-plugins-core epel-release
122+
EPEL=epel-release
123+
if [ "${AUDITWHEEL_PLAT}" == "manylinux_2_28_i686" ]; then
124+
EPEL=
125+
fi
126+
dnf -y install dnf-plugins-core ${EPEL}
123127
if [ "${AUDITWHEEL_POLICY}" == "manylinux_2_28" ]; then
124128
dnf config-manager --set-enabled powertools
125129
else

0 commit comments

Comments
 (0)