Use Resolute (#8)

Co-authored-by: Andrew Murray <radarhere@users.noreply.github.com>

Author: radarhere

.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:

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-%)

ubuntu-26.04-plucky-amd64/update.sh

@@ -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

ubuntu-26.04-plucky-arm64v8/update.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+docker pull ubuntu:resolute