Merge pull request #229 from radarhere/arm64

.github/workflows/build.yml

@@ -10,13 +10,13 @@ concurrency:
 jobs:
   build:
     name: ${{ matrix.image }}
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
+        os: ["ubuntu-latest"]
         image:
           # Run slower jobs first to give them a headstart and reduce waiting time
-          - "ubuntu-22.04-jammy-arm64v8"
           - "ubuntu-24.04-noble-ppc64le"
           - "ubuntu-24.04-noble-s390x"
           # test image for manylinux-wheel build
@@ -43,15 +43,14 @@ jobs:
             test-image: "fedora-41-amd64"
           - image: "manylinux_2_28-wheel-build"
             test-image: "fedora-41-amd64"
-          - image: "ubuntu-22.04-jammy-arm64v8"
-            qemu-arch: "aarch64"
-            docker-args: "--platform linux/arm64"
           - image: "ubuntu-24.04-noble-ppc64le"
             qemu-arch: "ppc64le"
             docker-args: "--platform linux/ppc64le"
           - image: "ubuntu-24.04-noble-s390x"
             qemu-arch: "s390x"
             docker-args: "--platform linux/s390x"
+          - image: "ubuntu-24.04-noble-arm64v8"
+            os: "ubuntu-24.04-arm"
 
     steps:
       - uses: actions/checkout@v4

Makefile

@@ -15,7 +15,7 @@ TARGETS = \
 	ubuntu-22.04-jammy-amd64 \
 	ubuntu-24.04-noble-amd64 \
 	ubuntu-22.04-jammy-amd64-valgrind \
-	ubuntu-22.04-jammy-arm64v8 \
+	ubuntu-24.04-noble-arm64v8 \
 	ubuntu-24.04-noble-ppc64le \
 	ubuntu-24.04-noble-s390x
 

ubuntu-24.04-noble-arm64v8/Dockerfile

@@ -0,0 +1,51 @@
+FROM arm64v8/ubuntu:noble
+
+RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
+    cmake \
+    ghostscript \
+    git \
+    libfreetype6-dev \
+    libfribidi-dev \
+    libharfbuzz-dev \
+    libimagequant-dev \
+    libjpeg-turbo8-dev \
+    liblcms2-dev \
+    libopenjp2-7-dev \
+    libssl-dev \
+    libtiff5-dev \
+    libwebp-dev \
+    meson \
+    netpbm \
+    python3-dev \
+    python3-numpy \
+    python3-setuptools \
+    python3-tk \
+    sudo \
+    tcl8.6-dev \
+    tk8.6-dev \
+    virtualenv \
+    wget \
+    xvfb \
+    zlib1g-dev \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN useradd pillow \
+    && mkdir /home/pillow \
+    && chown pillow:pillow /home/pillow
+
+ARG PIP_DISABLE_PIP_VERSION_CHECK=1
+ARG PIP_NO_CACHE_DIR=1
+
+RUN virtualenv -p /usr/bin/python3.12 --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
+
+ADD depends /depends
+RUN cd /depends \
+    && ./install_raqm.sh
+
+USER pillow
+CMD ["depends/test.sh"]
+
+#docker run -v $GITHUB_WORKSPACE:/Pillow pythonpillow/ubuntu-24.04-noble-arm64v8

ubuntu-24.04-noble-arm64v8/Makefile

@@ -0,0 +1 @@
+../Makefile.sub

ubuntu-24.04-noble-arm64v8/test.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+source /vpy3/bin/activate
+cd /Pillow
+make clean
+make install-coverage
+/usr/bin/xvfb-run -a .ci/test.sh

ubuntu-24.04-noble-arm64v8/update.sh

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