Upgrade other Ubuntu jobs to Jammy

.github/workflows/build.yml

@@ -14,9 +14,9 @@ jobs:
           - "latest"
         image:
           # Run slower jobs first to give them a headstart and reduce waiting time
-          - "ubuntu-20.04-focal-arm64v8"
-          - "ubuntu-20.04-focal-ppc64le"
-          - "ubuntu-20.04-focal-s390x"
+          - "ubuntu-22.04-jammy-arm64v8"
+          - "ubuntu-22.04-jammy-ppc64le"
+          - "ubuntu-22.04-jammy-s390x"
           # Then run the remainder
           - "alpine"
           - "amazon-2-amd64"
@@ -32,13 +32,13 @@ jobs:
           - "ubuntu-18.04-bionic-amd64"
           - "ubuntu-20.04-focal-amd64"
           - "ubuntu-22.04-jammy-amd64"
-          - "ubuntu-20.04-focal-amd64-valgrind"
+          - "ubuntu-22.04-jammy-amd64-valgrind"
         include:
-          - image: "ubuntu-20.04-focal-arm64v8"
+          - image: "ubuntu-22.04-jammy-arm64v8"
             qemu-arch: "aarch64"
-          - image: "ubuntu-20.04-focal-ppc64le"
+          - image: "ubuntu-22.04-jammy-ppc64le"
             qemu-arch: "ppc64le"
-          - image: "ubuntu-20.04-focal-s390x"
+          - image: "ubuntu-22.04-jammy-s390x"
             qemu-arch: "s390x"
 
     steps:

Makefile

@@ -13,10 +13,10 @@ TARGETS = \
 	ubuntu-18.04-bionic-amd64 \
 	ubuntu-20.04-focal-amd64 \
 	ubuntu-22.04-jammy-amd64 \
-	ubuntu-20.04-focal-amd64-valgrind \
-	ubuntu-20.04-focal-arm64v8 \
-	ubuntu-20.04-focal-ppc64le \
-	ubuntu-20.04-focal-s390x
+	ubuntu-22.04-jammy-amd64-valgrind \
+	ubuntu-22.04-jammy-arm64v8 \
+	ubuntu-22.04-jammy-ppc64le \
+	ubuntu-22.04-jammy-s390x
 
 BUILDDIRS = $(TARGETS:%=build-%)
 PUSHDIRS = $(TARGETS:%=push-%)

ubuntu-20.04-focal-amd64-valgrind/Dockerfile → ubuntu-22.04-jammy-amd64-valgrind/Dockerfile

@@ -1,8 +1,8 @@
-FROM ubuntu:focal
+FROM ubuntu:jammy
 
 RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
+    cargo \
     cmake \
-    curl \
     ghostscript \
     git \
     libffi-dev \
@@ -16,12 +16,11 @@ RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
     libssl-dev \
     libtiff5-dev \
     libwebp-dev \
+    meson \
     netpbm \
-    ninja-build \
-    python3.8-dbg \
+    python3.10-dbg \
     python3-dev \
     python3-numpy \
-    python3-pip \
     python3-setuptools \
     python3-tk \
     sudo \
@@ -34,21 +33,17 @@ RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
     valgrind \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-ENV PATH="/root/.cargo/bin:${PATH}"
-
 RUN useradd pillow \
     && addgroup pillow sudo \
     && mkdir /home/pillow \
     && chown pillow:pillow /home/pillow
 
-RUN virtualenv -p /usr/bin/python3.8-dbg --system-site-packages /vpy3 \
+RUN virtualenv -p /usr/bin/python3.10-dbg --system-site-packages /vpy3 \
     && /vpy3/bin/pip install --no-cache-dir --upgrade pip \
     && /vpy3/bin/pip install --no-cache-dir cffi olefile pytest pytest-cov pytest-timeout pytest-valgrind \
     && chown -R pillow:pillow /vpy3
 
 ADD depends /depends
-RUN /usr/bin/python3.8-dbg -m pip install --no-cache-dir meson
 RUN cd /depends \
     && ./install_imagequant.sh \
     && ./install_raqm.sh
@@ -58,4 +53,4 @@ COPY python.supp /depends
 USER pillow
 CMD ["depends/test.sh"]
 
-#docker run -v $TRAVIS_BUILD_DIR:/Pillow pythonpillow/ubuntu-20.04-focal-amd64
+#docker run -v $TRAVIS_BUILD_DIR:/Pillow pythonpillow/ubuntu-22.04-jammy-amd64

ubuntu-20.04-focal-ppc64le/Dockerfile → ubuntu-22.04-jammy-arm64v8/Dockerfile

@@ -1,8 +1,8 @@
-FROM ppc64le/ubuntu:focal
+FROM arm64v8/ubuntu:jammy
 
 RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
+    cargo \
     cmake \
-    curl \
     ghostscript \
     git \
     libffi-dev \
@@ -16,11 +16,10 @@ RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
     libssl-dev \
     libtiff5-dev \
     libwebp-dev \
+    meson \
     netpbm \
-    ninja-build \
     python3-dev \
     python3-numpy \
-    python3-pip \
     python3-setuptools \
     python3-tk \
     sudo \
@@ -32,26 +31,22 @@ RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
     zlib1g-dev \
     && rm -rf /var/lib/apt/lists/*
 
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-ENV PATH="/root/.cargo/bin:${PATH}"
-
 RUN useradd pillow \
     && addgroup pillow sudo \
     && mkdir /home/pillow \
     && chown pillow:pillow /home/pillow
 
-RUN virtualenv -p /usr/bin/python3.8 --system-site-packages /vpy3 \
+RUN virtualenv -p /usr/bin/python3.10 --system-site-packages /vpy3 \
     && /vpy3/bin/pip install --no-cache-dir --upgrade pip \
     && /vpy3/bin/pip install --no-cache-dir cffi olefile pytest pytest-cov pytest-timeout \
     && chown -R pillow:pillow /vpy3
 
 ADD depends /depends
-RUN python3.8 -m pip install --no-cache-dir meson
 RUN cd /depends \
     && ./install_imagequant.sh \
     && ./install_raqm.sh
 
 USER pillow
 CMD ["depends/test.sh"]
 
-#docker run -v $GITHUB_WORKSPACE:/Pillow pythonpillow/ubuntu-20.04-focal-ppc64le
+#docker run -v $GITHUB_WORKSPACE:/Pillow pythonpillow/ubuntu-22.04-jammy-arm64v8

ubuntu-20.04-focal-arm64v8/Dockerfile → ubuntu-22.04-jammy-ppc64le/Dockerfile

@@ -1,8 +1,8 @@
-FROM arm64v8/ubuntu:focal
+FROM ppc64le/ubuntu:jammy
 
 RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
+    cargo \
     cmake \
-    curl \
     ghostscript \
     git \
     libffi-dev \
@@ -16,11 +16,10 @@ RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
     libssl-dev \
     libtiff5-dev \
     libwebp-dev \
+    meson \
     netpbm \
-    ninja-build \
     python3-dev \
     python3-numpy \
-    python3-pip \
     python3-setuptools \
     python3-tk \
     sudo \
@@ -32,26 +31,22 @@ RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
     zlib1g-dev \
     && rm -rf /var/lib/apt/lists/*
 
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-ENV PATH="/root/.cargo/bin:${PATH}"
-
 RUN useradd pillow \
     && addgroup pillow sudo \
     && mkdir /home/pillow \
     && chown pillow:pillow /home/pillow
 
-RUN virtualenv -p /usr/bin/python3.8 --system-site-packages /vpy3 \
+RUN virtualenv -p /usr/bin/python3.10 --system-site-packages /vpy3 \
     && /vpy3/bin/pip install --no-cache-dir --upgrade pip \
     && /vpy3/bin/pip install --no-cache-dir cffi olefile pytest pytest-cov pytest-timeout \
     && chown -R pillow:pillow /vpy3
 
 ADD depends /depends
-RUN /usr/bin/python3.8 -m pip install --no-cache-dir meson
 RUN cd /depends \
     && ./install_imagequant.sh \
     && ./install_raqm.sh
 
 USER pillow
 CMD ["depends/test.sh"]
 
-#docker run -v $GITHUB_WORKSPACE:/Pillow pythonpillow/ubuntu-20.04-focal-arm64v8
+#docker run -v $GITHUB_WORKSPACE:/Pillow pythonpillow/ubuntu-22.04-jammy-ppc64le

ubuntu-20.04-focal-s390x/Dockerfile → ubuntu-22.04-jammy-s390x/Dockerfile

@@ -1,4 +1,4 @@
-FROM s390x/ubuntu:focal
+FROM s390x/ubuntu:jammy
 
 RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
     cmake \
@@ -14,11 +14,10 @@ RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
     liblcms2-dev \
     libopenjp2-7-dev \
     libtiff5-dev \
+    meson \
     netpbm \
-    ninja-build \
     python3-dev \
     python3-numpy \
-    python3-pip \
     python3-setuptools \
     python3-tk \
     sudo \
@@ -35,13 +34,12 @@ RUN useradd pillow \
     && mkdir /home/pillow \
     && chown pillow:pillow /home/pillow
 
-RUN virtualenv -p /usr/bin/python3.8 --system-site-packages /vpy3 \
+RUN virtualenv -p /usr/bin/python3.10 --system-site-packages /vpy3 \
     && /vpy3/bin/pip install --no-cache-dir --upgrade pip \
     && /vpy3/bin/pip install --no-cache-dir cffi olefile pytest pytest-cov pytest-timeout \
     && chown -R pillow:pillow /vpy3
 
 ADD depends /depends
-RUN python3.8 -m pip install --no-cache-dir meson
 RUN cd /depends \
     && ./install_imagequant.sh \
     && ./install_raqm.sh \
@@ -50,4 +48,4 @@ RUN cd /depends \
 USER pillow
 CMD ["depends/test.sh"]
 
-#docker run -v $GITHUB_WORKSPACE:/Pillow pythonpillow/ubuntu-20.04-focal-s390x
+#docker run -v $GITHUB_WORKSPACE:/Pillow pythonpillow/ubuntu-22.04-jammy-s390x