remove native builders and armv8l

This commit is contained in:
aptalca 2023-04-04 11:03:52 -04:00
parent e4e7eb6b0a
commit 22d06d4a45
No known key found for this signature in database
GPG Key ID: BE36CFFB9FD85548
7 changed files with 11 additions and 130 deletions

View File

@ -54,7 +54,7 @@ jobs:
if echo "${PACKAGES}" | grep -q "${PACKAGE}"; then
break
fi
for ARCH in armv7l armv8l; do
for ARCH in armv7l; do
if ! grep -q "${PACKAGE}-${VERSION}-${CPYTHON}.*${ARCH}.whl" "docs/${OS}/index.html"; then
echo "**** Adding ${PACKAGE}-${VERSION} to build list ****"
PACKAGES="${PACKAGE} ${PACKAGES}"

View File

@ -116,6 +116,8 @@ RUN \
/var/tmp/* \
${HOME}/.cargo \
${HOME}/.cache && \
echo "**** Renaming wheels if necessary ****" && \
/bin/bash -c 'for i in $(ls /build/*armv8l*.whl 2>/dev/null); do echo "processing ${i}" && mv -- "$i" "${i//armv8l/armv7l}"; done' && \
echo "**** Wheels built are: ****" && \
ls /build

26
Jenkinsfile vendored
View File

@ -21,7 +21,7 @@ pipeline {
axes {
axis {
name 'MATRIXARCH'
values 'X86-64-MULTI', 'ARM64', 'ARMHF-WHEELIE-NATIVE', 'ARMHF-WHEELIE-CHROOT'
values 'X86-64-MULTI', 'ARM64', 'ARMHF-WHEELIE-CHROOT'
}
axis {
name 'MATRIXDISTRO'
@ -55,23 +55,20 @@ pipeline {
DISTROVER=$(echo ${MATRIXDISTRO} | sed 's|.*-||')
if [ "${MATRIXARCH}" == "X86-64-MULTI" ]; then
ARCH="amd64"
PLATFORM="linux/amd64"
elif [ "${MATRIXARCH}" == "ARM64" ]; then
ARCH="arm64v8"
elif [ "${MATRIXARCH}" == "ARMHF-WHEELIE-CHROOT" ]; then
ARCH="arm32v8"
PLATFORM="linux/arm64"
else
ARCH="arm32v7"
PLATFORM="linux/arm/v7"
fi
if [ "${ARCH}" == "arm32v8" ]; then
INTERNALARCH="arm32v7"
else
INTERNALARCH="${ARCH}"
fi
docker build \
docker buildx build \
--no-cache --pull -t ghcr.io/linuxserver/wheelie:${ARCH}-${DISTRONAME}-${DISTROVER} \
--platform=${PLATFORM} \
--build-arg DISTRO=${DISTRONAME} \
--build-arg DISTROVER=${DISTROVER} \
--build-arg ARCH=${INTERNALARCH} \
--build-arg ARCH=${ARCH} \
--build-arg PACKAGES=\"${PACKAGES}\" .
'''
echo 'Pushing images to ghcr'
@ -83,16 +80,9 @@ pipeline {
ARCH="amd64"
elif [ "${MATRIXARCH}" == "ARM64" ]; then
ARCH="arm64v8"
elif [ "${MATRIXARCH}" == "ARMHF-WHEELIE-CHROOT" ]; then
ARCH="arm32v8"
else
ARCH="arm32v7"
fi
if [ "${ARCH}" == "arm32v8" ]; then
INTERNALARCH="arm32v7"
else
INTERNALARCH="${ARCH}"
fi
docker push ghcr.io/linuxserver/wheelie:${ARCH}-${DISTRONAME}-${DISTROVER}
docker rmi \
ghcr.io/linuxserver/wheelie:${ARCH}-${DISTRONAME}-${DISTROVER} || :
@ -118,7 +108,7 @@ pipeline {
else
mkdir -p builds/build-${distro}
fi
for arch in amd64 arm32v8 arm64v8 arm32v7; do
for arch in amd64 arm64v8 arm32v7; do
echo "**** Retrieving wheels for ${arch}-${distro} ****"
docker pull ghcr.io/linuxserver/wheelie:${arch}-${distro}
docker create --name ${arch}-${distro} ghcr.io/linuxserver/wheelie:${arch}-${distro} blah

View File

@ -1289,26 +1289,5 @@
<a href='https://wheels.linuxserver.io/alpine-3.15/Pillow-9.5.0-cp39-cp39-musllinux_1_1_x86_64.whl'>Pillow-9.5.0-cp39-cp39-musllinux_1_1_x86_64.whl</a>
<br />
<a href='https://wheels.linuxserver.io/alpine-3.15/rapidfuzz-2.15.0-cp39-cp39-linux_armv7l.whl'>rapidfuzz-2.15.0-cp39-cp39-linux_armv7l.whl</a>
<br />
<a href='https://wheels.linuxserver.io/alpine-3.15/rapidfuzz-2.15.0-cp39-cp39-linux_armv8l.whl'>rapidfuzz-2.15.0-cp39-cp39-linux_armv8l.whl</a>
<br />
<a href='https://wheels.linuxserver.io/alpine-3.15/rapidfuzz-2.15.0-cp39-cp39-musllinux_1_1_aarch64.whl'>rapidfuzz-2.15.0-cp39-cp39-musllinux_1_1_aarch64.whl</a>
<br />
<a href='https://wheels.linuxserver.io/alpine-3.15/rapidfuzz-2.15.0-cp39-cp39-musllinux_1_1_x86_64.whl'>rapidfuzz-2.15.0-cp39-cp39-musllinux_1_1_x86_64.whl</a>
<br />
<a href='https://wheels.linuxserver.io/alpine-3.15/pandas-2.0.0-cp39-cp39-linux_aarch64.whl'>pandas-2.0.0-cp39-cp39-linux_aarch64.whl</a>
<br />
<a href='https://wheels.linuxserver.io/alpine-3.15/pandas-2.0.0-cp39-cp39-linux_armv8l.whl'>pandas-2.0.0-cp39-cp39-linux_armv8l.whl</a>
<br />
<a href='https://wheels.linuxserver.io/alpine-3.15/pandas-2.0.0-cp39-cp39-linux_x86_64.whl'>pandas-2.0.0-cp39-cp39-linux_x86_64.whl</a>
<br />
</body>
</html>

View File

@ -1012,26 +1012,5 @@
<a href='https://wheels.linuxserver.io/alpine-3.16/Pillow-9.5.0-cp310-cp310-musllinux_1_1_x86_64.whl'>Pillow-9.5.0-cp310-cp310-musllinux_1_1_x86_64.whl</a>
<br />
<a href='https://wheels.linuxserver.io/alpine-3.16/rapidfuzz-2.15.0-cp310-cp310-linux_armv7l.whl'>rapidfuzz-2.15.0-cp310-cp310-linux_armv7l.whl</a>
<br />
<a href='https://wheels.linuxserver.io/alpine-3.16/rapidfuzz-2.15.0-cp310-cp310-linux_armv8l.whl'>rapidfuzz-2.15.0-cp310-cp310-linux_armv8l.whl</a>
<br />
<a href='https://wheels.linuxserver.io/alpine-3.16/rapidfuzz-2.15.0-cp310-cp310-musllinux_1_1_aarch64.whl'>rapidfuzz-2.15.0-cp310-cp310-musllinux_1_1_aarch64.whl</a>
<br />
<a href='https://wheels.linuxserver.io/alpine-3.16/rapidfuzz-2.15.0-cp310-cp310-musllinux_1_1_x86_64.whl'>rapidfuzz-2.15.0-cp310-cp310-musllinux_1_1_x86_64.whl</a>
<br />
<a href='https://wheels.linuxserver.io/alpine-3.16/pandas-2.0.0-cp310-cp310-linux_aarch64.whl'>pandas-2.0.0-cp310-cp310-linux_aarch64.whl</a>
<br />
<a href='https://wheels.linuxserver.io/alpine-3.16/pandas-2.0.0-cp310-cp310-linux_armv8l.whl'>pandas-2.0.0-cp310-cp310-linux_armv8l.whl</a>
<br />
<a href='https://wheels.linuxserver.io/alpine-3.16/pandas-2.0.0-cp310-cp310-linux_x86_64.whl'>pandas-2.0.0-cp310-cp310-linux_x86_64.whl</a>
<br />
</body>
</html>

View File

@ -475,26 +475,5 @@
<a href='https://wheels.linuxserver.io/alpine-3.17/Pillow-9.5.0-cp310-cp310-musllinux_1_1_x86_64.whl'>Pillow-9.5.0-cp310-cp310-musllinux_1_1_x86_64.whl</a>
<br />
<a href='https://wheels.linuxserver.io/alpine-3.17/rapidfuzz-2.15.0-cp310-cp310-linux_armv7l.whl'>rapidfuzz-2.15.0-cp310-cp310-linux_armv7l.whl</a>
<br />
<a href='https://wheels.linuxserver.io/alpine-3.17/rapidfuzz-2.15.0-cp310-cp310-linux_armv8l.whl'>rapidfuzz-2.15.0-cp310-cp310-linux_armv8l.whl</a>
<br />
<a href='https://wheels.linuxserver.io/alpine-3.17/rapidfuzz-2.15.0-cp310-cp310-musllinux_1_1_aarch64.whl'>rapidfuzz-2.15.0-cp310-cp310-musllinux_1_1_aarch64.whl</a>
<br />
<a href='https://wheels.linuxserver.io/alpine-3.17/rapidfuzz-2.15.0-cp310-cp310-musllinux_1_1_x86_64.whl'>rapidfuzz-2.15.0-cp310-cp310-musllinux_1_1_x86_64.whl</a>
<br />
<a href='https://wheels.linuxserver.io/alpine-3.17/pandas-2.0.0-cp310-cp310-linux_aarch64.whl'>pandas-2.0.0-cp310-cp310-linux_aarch64.whl</a>
<br />
<a href='https://wheels.linuxserver.io/alpine-3.17/pandas-2.0.0-cp310-cp310-linux_armv8l.whl'>pandas-2.0.0-cp310-cp310-linux_armv8l.whl</a>
<br />
<a href='https://wheels.linuxserver.io/alpine-3.17/pandas-2.0.0-cp310-cp310-linux_x86_64.whl'>pandas-2.0.0-cp310-cp310-linux_x86_64.whl</a>
<br />
</body>
</html>

View File

@ -3526,53 +3526,5 @@
<a href='https://wheels.linuxserver.io/ubuntu/Pillow-9.5.0-cp38-cp38-manylinux_2_28_x86_64.whl'>Pillow-9.5.0-cp38-cp38-manylinux_2_28_x86_64.whl</a>
<br />
<a href='https://wheels.linuxserver.io/ubuntu/rapidfuzz-2.15.0-cp310-cp310-linux_armv7l.whl'>rapidfuzz-2.15.0-cp310-cp310-linux_armv7l.whl</a>
<br />
<a href='https://wheels.linuxserver.io/ubuntu/rapidfuzz-2.15.0-cp310-cp310-linux_armv8l.whl'>rapidfuzz-2.15.0-cp310-cp310-linux_armv8l.whl</a>
<br />
<a href='https://wheels.linuxserver.io/ubuntu/rapidfuzz-2.15.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl'>rapidfuzz-2.15.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl</a>
<br />
<a href='https://wheels.linuxserver.io/ubuntu/rapidfuzz-2.15.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl'>rapidfuzz-2.15.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl</a>
<br />
<a href='https://wheels.linuxserver.io/ubuntu/rapidfuzz-2.15.0-cp38-cp38-linux_armv7l.whl'>rapidfuzz-2.15.0-cp38-cp38-linux_armv7l.whl</a>
<br />
<a href='https://wheels.linuxserver.io/ubuntu/rapidfuzz-2.15.0-cp38-cp38-linux_armv8l.whl'>rapidfuzz-2.15.0-cp38-cp38-linux_armv8l.whl</a>
<br />
<a href='https://wheels.linuxserver.io/ubuntu/rapidfuzz-2.15.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl'>rapidfuzz-2.15.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl</a>
<br />
<a href='https://wheels.linuxserver.io/ubuntu/rapidfuzz-2.15.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl'>rapidfuzz-2.15.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl</a>
<br />
<a href='https://wheels.linuxserver.io/ubuntu/pandas-2.0.0-cp310-cp310-linux_aarch64.whl'>pandas-2.0.0-cp310-cp310-linux_aarch64.whl</a>
<br />
<a href='https://wheels.linuxserver.io/ubuntu/pandas-2.0.0-cp310-cp310-linux_armv8l.whl'>pandas-2.0.0-cp310-cp310-linux_armv8l.whl</a>
<br />
<a href='https://wheels.linuxserver.io/ubuntu/pandas-2.0.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl'>pandas-2.0.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl</a>
<br />
<a href='https://wheels.linuxserver.io/ubuntu/pandas-2.0.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl'>pandas-2.0.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl</a>
<br />
<a href='https://wheels.linuxserver.io/ubuntu/pandas-2.0.0-cp38-cp38-linux_aarch64.whl'>pandas-2.0.0-cp38-cp38-linux_aarch64.whl</a>
<br />
<a href='https://wheels.linuxserver.io/ubuntu/pandas-2.0.0-cp38-cp38-linux_armv8l.whl'>pandas-2.0.0-cp38-cp38-linux_armv8l.whl</a>
<br />
<a href='https://wheels.linuxserver.io/ubuntu/pandas-2.0.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl'>pandas-2.0.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl</a>
<br />
<a href='https://wheels.linuxserver.io/ubuntu/pandas-2.0.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl'>pandas-2.0.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl</a>
<br />
</body>
</html>