From ba606622b4441b87ec74d420a25f0c60882004eb Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Sat, 18 Jan 2025 13:53:39 +1100
Subject: [PATCH] Updated Ubuntu arm to 24.04 with arm64 runner

---
 .github/workflows/test-docker.yml      | 9 +++++----
 docs/installation/platform-support.rst | 6 ++----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/test-docker.yml b/.github/workflows/test-docker.yml
index bebb9cda277..0d9033413e3 100644
--- a/.github/workflows/test-docker.yml
+++ b/.github/workflows/test-docker.yml
@@ -29,13 +29,13 @@ concurrency:
 jobs:
   build:
 
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
+        os: ["ubuntu-latest"]
         docker: [
           # 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,
           # Then run the remainder
@@ -55,12 +55,13 @@ jobs:
         ]
         dockerTag: [main]
         include:
-          - docker: "ubuntu-22.04-jammy-arm64v8"
-            qemu-arch: "aarch64"
           - docker: "ubuntu-24.04-noble-ppc64le"
             qemu-arch: "ppc64le"
           - docker: "ubuntu-24.04-noble-s390x"
             qemu-arch: "s390x"
+          - docker: "ubuntu-24.04-noble-arm64v8"
+            os: "ubuntu-24.04-arm"
+            dockerTag: main
 
     name: ${{ matrix.docker }}
 
diff --git a/docs/installation/platform-support.rst b/docs/installation/platform-support.rst
index 814d6a9cfb9..9eafad3c4b7 100644
--- a/docs/installation/platform-support.rst
+++ b/docs/installation/platform-support.rst
@@ -44,11 +44,9 @@ These platforms are built and tested for every change.
 +----------------------------------+----------------------------+---------------------+
 | Ubuntu Linux 22.04 LTS (Jammy)   | 3.9, 3.10, 3.11,           | x86-64              |
 |                                  | 3.12, 3.13, PyPy3          |                     |
-|                                  +----------------------------+---------------------+
-|                                  | 3.10                       | arm64v8             |
 +----------------------------------+----------------------------+---------------------+
-| Ubuntu Linux 24.04 LTS (Noble)   | 3.12                       | x86-64, ppc64le,    |
-|                                  |                            | s390x               |
+| Ubuntu Linux 24.04 LTS (Noble)   | 3.12                       | x86-64, arm64v8,    |
+|                                  |                            | ppc64le, s390x      |
 +----------------------------------+----------------------------+---------------------+
 | Windows Server 2019              | 3.9                        | x86                 |
 +----------------------------------+----------------------------+---------------------+