diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ddc80680..9360b311 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,8 +21,8 @@ jobs: # Run slower jobs first to give them a headstart and reduce waiting time - "ubuntu-24.04-noble-ppc64le" - "ubuntu-24.04-noble-s390x" - - "ubuntu-26.04-plucky-ppc64le" - - "ubuntu-26.04-plucky-s390x" + - "ubuntu-26.04-resolute-ppc64le" + - "ubuntu-26.04-resolute-s390x" # test image for manylinux-wheel build - "fedora-43-amd64" # Then run the remainder @@ -37,7 +37,7 @@ jobs: - "ubuntu-22.04-jammy-amd64" - "ubuntu-22.04-jammy-amd64-valgrind" - "ubuntu-24.04-noble-amd64" - - "ubuntu-26.04-plucky-amd64" + - "ubuntu-26.04-resolute-amd64" # has a dependency on the test image - "manylinux_2_28-wheel-build" include: @@ -51,13 +51,13 @@ jobs: docker-args: "--platform linux/s390x" - image: "ubuntu-24.04-noble-arm64v8" os: "ubuntu-24.04-arm" - - image: "ubuntu-26.04-plucky-ppc64le" + - image: "ubuntu-26.04-resolute-ppc64le" qemu-arch: "ppc64le" docker-args: "--platform linux/ppc64le" - - image: "ubuntu-26.04-plucky-s390x" + - image: "ubuntu-26.04-resolute-s390x" qemu-arch: "s390x" docker-args: "--platform linux/s390x" - - image: "ubuntu-26.04-plucky-arm64v8" + - image: "ubuntu-26.04-resolute-arm64v8" os: "ubuntu-24.04-arm" steps: diff --git a/Makefile b/Makefile index cac27317..4ea04d14 100644 --- a/Makefile +++ b/Makefile @@ -11,14 +11,14 @@ TARGETS = \ manylinux_2_28-wheel-build \ ubuntu-22.04-jammy-amd64 \ ubuntu-24.04-noble-amd64 \ + ubuntu-26.04-resolute-amd64 \ ubuntu-22.04-jammy-amd64-valgrind \ ubuntu-24.04-noble-arm64v8 \ ubuntu-24.04-noble-ppc64le \ ubuntu-24.04-noble-s390x \ - ubuntu-26.04-plucky-amd64 \ - ubuntu-26.04-plucky-arm64v8 \ - ubuntu-26.04-plucky-ppc64le \ - ubuntu-26.04-plucky-s390x + ubuntu-26.04-resolute-arm64v8 \ + ubuntu-26.04-resolute-ppc64le \ + ubuntu-26.04-resolute-s390x BUILDDIRS = $(TARGETS:%=build-%) PUSHDIRS = $(TARGETS:%=push-%) diff --git a/ubuntu-26.04-plucky-amd64/update.sh b/ubuntu-26.04-plucky-amd64/update.sh deleted file mode 100755 index 3812ae7f..00000000 --- a/ubuntu-26.04-plucky-amd64/update.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -docker pull ubuntu:plucky diff --git a/ubuntu-26.04-plucky-arm64v8/update.sh b/ubuntu-26.04-plucky-arm64v8/update.sh deleted file mode 100755 index c20affd8..00000000 --- a/ubuntu-26.04-plucky-arm64v8/update.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -docker pull arm64v8/ubuntu:plucky diff --git a/ubuntu-26.04-plucky-ppc64le/update.sh b/ubuntu-26.04-plucky-ppc64le/update.sh deleted file mode 100755 index f6fac1a3..00000000 --- a/ubuntu-26.04-plucky-ppc64le/update.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -docker pull $DOCKER_ARGS ppc64le/ubuntu:plucky diff --git a/ubuntu-26.04-plucky-s390x/update.sh b/ubuntu-26.04-plucky-s390x/update.sh deleted file mode 100755 index 4b750889..00000000 --- a/ubuntu-26.04-plucky-s390x/update.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -docker pull $DOCKER_ARGS s390x/ubuntu:plucky diff --git a/ubuntu-26.04-plucky-amd64/Dockerfile b/ubuntu-26.04-resolute-amd64/Dockerfile similarity index 92% rename from ubuntu-26.04-plucky-amd64/Dockerfile rename to ubuntu-26.04-resolute-amd64/Dockerfile index 56b20b2f..b358d33b 100644 --- a/ubuntu-26.04-plucky-amd64/Dockerfile +++ b/ubuntu-26.04-resolute-amd64/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:plucky +FROM ubuntu:resolute RUN apt-get -qq update \ && DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \ @@ -49,7 +49,7 @@ RUN useradd pillow \ ARG PIP_DISABLE_PIP_VERSION_CHECK=1 ARG PIP_NO_CACHE_DIR=1 -RUN virtualenv -p /usr/bin/python3.13 --system-site-packages /vpy3 \ +RUN virtualenv -p /usr/bin/python3.14 --system-site-packages /vpy3 \ && /vpy3/bin/pip install --upgrade pip \ && /vpy3/bin/pip install olefile pyside6 pytest pytest-cov pytest-timeout \ && chown -R pillow:pillow /vpy3 @@ -63,4 +63,4 @@ ENV FORCE_COLOR=1 USER pillow CMD ["depends/test.sh"] -#docker run -v $GITHUB_WORKSPACE:/Pillow pythonpillow/ubuntu-26.04-plucky-amd64 +#docker run -v $GITHUB_WORKSPACE:/Pillow pythonpillow/ubuntu-26.04-resolute-amd64 diff --git a/ubuntu-26.04-plucky-amd64/Makefile b/ubuntu-26.04-resolute-amd64/Makefile similarity index 100% rename from ubuntu-26.04-plucky-amd64/Makefile rename to ubuntu-26.04-resolute-amd64/Makefile diff --git a/ubuntu-26.04-plucky-amd64/test.sh b/ubuntu-26.04-resolute-amd64/test.sh similarity index 100% rename from ubuntu-26.04-plucky-amd64/test.sh rename to ubuntu-26.04-resolute-amd64/test.sh diff --git a/ubuntu-26.04-resolute-amd64/update.sh b/ubuntu-26.04-resolute-amd64/update.sh new file mode 100755 index 00000000..4a0b9432 --- /dev/null +++ b/ubuntu-26.04-resolute-amd64/update.sh @@ -0,0 +1,2 @@ +#!/bin/sh +docker pull ubuntu:resolute diff --git a/ubuntu-26.04-plucky-arm64v8/Dockerfile b/ubuntu-26.04-resolute-arm64v8/Dockerfile similarity index 92% rename from ubuntu-26.04-plucky-arm64v8/Dockerfile rename to ubuntu-26.04-resolute-arm64v8/Dockerfile index 1347bdd7..25770a9b 100644 --- a/ubuntu-26.04-plucky-arm64v8/Dockerfile +++ b/ubuntu-26.04-resolute-arm64v8/Dockerfile @@ -1,4 +1,4 @@ -FROM arm64v8/ubuntu:plucky +FROM arm64v8/ubuntu:resolute RUN apt-get -qq update \ && DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \ @@ -49,7 +49,7 @@ RUN useradd pillow \ ARG PIP_DISABLE_PIP_VERSION_CHECK=1 ARG PIP_NO_CACHE_DIR=1 -RUN virtualenv -p /usr/bin/python3.13 --system-site-packages /vpy3 \ +RUN virtualenv -p /usr/bin/python3.14 --system-site-packages /vpy3 \ && /vpy3/bin/pip install --upgrade pip \ && /vpy3/bin/pip install olefile pyside6 pytest pytest-cov pytest-timeout \ && chown -R pillow:pillow /vpy3 @@ -63,4 +63,4 @@ ENV FORCE_COLOR=1 USER pillow CMD ["depends/test.sh"] -#docker run -v $GITHUB_WORKSPACE:/Pillow pythonpillow/ubuntu-26.04-plucky-arm64v8 +#docker run -v $GITHUB_WORKSPACE:/Pillow pythonpillow/ubuntu-26.04-resolute-arm64v8 diff --git a/ubuntu-26.04-plucky-arm64v8/Makefile b/ubuntu-26.04-resolute-arm64v8/Makefile similarity index 100% rename from ubuntu-26.04-plucky-arm64v8/Makefile rename to ubuntu-26.04-resolute-arm64v8/Makefile diff --git a/ubuntu-26.04-plucky-arm64v8/test.sh b/ubuntu-26.04-resolute-arm64v8/test.sh similarity index 100% rename from ubuntu-26.04-plucky-arm64v8/test.sh rename to ubuntu-26.04-resolute-arm64v8/test.sh diff --git a/ubuntu-26.04-resolute-arm64v8/update.sh b/ubuntu-26.04-resolute-arm64v8/update.sh new file mode 100755 index 00000000..f502354e --- /dev/null +++ b/ubuntu-26.04-resolute-arm64v8/update.sh @@ -0,0 +1,2 @@ +#!/bin/sh +docker pull arm64v8/ubuntu:resolute diff --git a/ubuntu-26.04-plucky-ppc64le/Dockerfile b/ubuntu-26.04-resolute-ppc64le/Dockerfile similarity index 90% rename from ubuntu-26.04-plucky-ppc64le/Dockerfile rename to ubuntu-26.04-resolute-ppc64le/Dockerfile index c318dcff..d3bd1f7f 100644 --- a/ubuntu-26.04-plucky-ppc64le/Dockerfile +++ b/ubuntu-26.04-resolute-ppc64le/Dockerfile @@ -1,4 +1,4 @@ -FROM ppc64le/ubuntu:plucky +FROM ppc64le/ubuntu:resolute RUN apt-get -qq update \ && DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \ @@ -39,7 +39,7 @@ RUN useradd pillow \ ARG PIP_DISABLE_PIP_VERSION_CHECK=1 ARG PIP_NO_CACHE_DIR=1 -RUN virtualenv -p /usr/bin/python3.13 --system-site-packages /vpy3 \ +RUN virtualenv -p /usr/bin/python3.14 --system-site-packages /vpy3 \ && /vpy3/bin/pip install --upgrade pip \ && /vpy3/bin/pip install olefile pytest pytest-cov pytest-timeout \ && chown -R pillow:pillow /vpy3 @@ -53,4 +53,4 @@ ENV FORCE_COLOR=1 USER pillow CMD ["depends/test.sh"] -#docker run -v $GITHUB_WORKSPACE:/Pillow pythonpillow/ubuntu-26.04-plucky-ppc64le +#docker run -v $GITHUB_WORKSPACE:/Pillow pythonpillow/ubuntu-26.04-resolute-ppc64le diff --git a/ubuntu-26.04-plucky-ppc64le/Makefile b/ubuntu-26.04-resolute-ppc64le/Makefile similarity index 100% rename from ubuntu-26.04-plucky-ppc64le/Makefile rename to ubuntu-26.04-resolute-ppc64le/Makefile diff --git a/ubuntu-26.04-plucky-ppc64le/test.sh b/ubuntu-26.04-resolute-ppc64le/test.sh similarity index 100% rename from ubuntu-26.04-plucky-ppc64le/test.sh rename to ubuntu-26.04-resolute-ppc64le/test.sh diff --git a/ubuntu-26.04-resolute-ppc64le/update.sh b/ubuntu-26.04-resolute-ppc64le/update.sh new file mode 100755 index 00000000..feeb6471 --- /dev/null +++ b/ubuntu-26.04-resolute-ppc64le/update.sh @@ -0,0 +1,2 @@ +#!/bin/sh +docker pull $DOCKER_ARGS ppc64le/ubuntu:resolute diff --git a/ubuntu-26.04-plucky-s390x/Dockerfile b/ubuntu-26.04-resolute-s390x/Dockerfile similarity index 91% rename from ubuntu-26.04-plucky-s390x/Dockerfile rename to ubuntu-26.04-resolute-s390x/Dockerfile index f1553e52..09df6529 100644 --- a/ubuntu-26.04-plucky-s390x/Dockerfile +++ b/ubuntu-26.04-resolute-s390x/Dockerfile @@ -1,4 +1,4 @@ -FROM s390x/ubuntu:plucky +FROM s390x/ubuntu:resolute RUN apt-get -qq update \ && DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \ @@ -37,7 +37,7 @@ RUN useradd pillow \ ARG PIP_DISABLE_PIP_VERSION_CHECK=1 ARG PIP_NO_CACHE_DIR=1 -RUN virtualenv -p /usr/bin/python3.13 --system-site-packages /vpy3 \ +RUN virtualenv -p /usr/bin/python3.14 --system-site-packages /vpy3 \ && /vpy3/bin/pip install --upgrade pip \ && /vpy3/bin/pip install olefile pytest pytest-cov pytest-timeout \ && chown -R pillow:pillow /vpy3 @@ -53,4 +53,4 @@ ENV LD_LIBRARY_PATH=/usr/lib USER pillow CMD ["depends/test.sh"] -#docker run -v $GITHUB_WORKSPACE:/Pillow pythonpillow/ubuntu-26.04-plucky-s390x +#docker run -v $GITHUB_WORKSPACE:/Pillow pythonpillow/ubuntu-26.04-resolute-s390x diff --git a/ubuntu-26.04-plucky-s390x/Makefile b/ubuntu-26.04-resolute-s390x/Makefile similarity index 100% rename from ubuntu-26.04-plucky-s390x/Makefile rename to ubuntu-26.04-resolute-s390x/Makefile diff --git a/ubuntu-26.04-plucky-s390x/test.sh b/ubuntu-26.04-resolute-s390x/test.sh similarity index 100% rename from ubuntu-26.04-plucky-s390x/test.sh rename to ubuntu-26.04-resolute-s390x/test.sh diff --git a/ubuntu-26.04-resolute-s390x/update.sh b/ubuntu-26.04-resolute-s390x/update.sh new file mode 100755 index 00000000..b6d1594d --- /dev/null +++ b/ubuntu-26.04-resolute-s390x/update.sh @@ -0,0 +1,2 @@ +#!/bin/sh +docker pull $DOCKER_ARGS s390x/ubuntu:resolute