Use ARM64 runners for all ARM-based builds

4 files changed, 23 insertions, 36 deletions

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 24d6f61535..8492c6f6b8 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -132,7 +132,7 @@ jobs:
             coverage: ubuntu_gcc_compat_no_opt
 
           - name: Ubuntu GCC ARM SF ASAN
-            os: ubuntu-latest
+            os: ubuntu-24.04-arm
             cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-arm.cmake -DWITH_SANITIZER=Address
             asan-options: detect_leaks=0
             packages: qemu-user crossbuild-essential-armel
@@ -140,14 +140,14 @@ jobs:
             coverage: ubuntu_gcc_armsf
 
           - name: Ubuntu GCC ARM SF Compat No Opt UBSAN
-            os: ubuntu-latest
+            os: ubuntu-24.04-arm
             cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-arm.cmake -DZLIB_COMPAT=ON -DWITH_NEW_STRATEGIES=OFF -DWITH_OPTIM=OFF -DWITH_SANITIZER=Undefined
             packages: qemu-user crossbuild-essential-armel
             gcov-exec: arm-linux-gnueabi-gcov
             coverage: ubuntu_gcc_armsf_compat_no_opt
 
           - name: Ubuntu GCC ARM HF ASAN
-            os: ubuntu-latest
+            os: ubuntu-24.04-arm
             cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-armhf.cmake -DWITH_SANITIZER=Address -DWITH_BENCHMARKS=ON
             cxxflags: -Wno-psabi -Wno-maybe-uninitialized
             asan-options: detect_leaks=0
@@ -156,7 +156,7 @@ jobs:
             coverage: ubuntu_gcc_armhf
 
           - name: Ubuntu GCC ARM HF No Neon No ARMv8 ASAN
-            os: ubuntu-latest
+            os: ubuntu-24.04-arm
             cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-armhf.cmake -DWITH_NEON=OFF -DWITH_ARMV8=OFF -DWITH_SANITIZER=Address
             asan-options: detect_leaks=0
             packages: qemu-user crossbuild-essential-armhf
@@ -164,25 +164,21 @@ jobs:
             coverage: ubuntu_gcc_armhf_no_neon_no_armv8
 
           - name: Ubuntu GCC ARM HF Compat No Opt UBSAN
-            os: ubuntu-latest
+            os: ubuntu-24.04-arm
             cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-armhf.cmake -DZLIB_COMPAT=ON -DWITH_NEW_STRATEGIES=OFF -DWITH_OPTIM=OFF -DWITH_SANITIZER=Undefined
             packages: qemu-user crossbuild-essential-armhf
             gcov-exec: arm-linux-gnueabihf-gcov
             coverage: ubuntu_gcc_armhf_compat_no_opt
 
           - name: Ubuntu GCC AARCH64 ASAN
-            os: ubuntu-22.04
-            cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-aarch64.cmake -DWITH_SANITIZER=Address -DWITH_BENCHMARKS=ON
+            os: ubuntu-24.04-arm
+            cmake-args: -DWITH_SANITIZER=Address -DWITH_BENCHMARKS=ON
             asan-options: detect_leaks=0
-            packages: qemu-user gcc-aarch64-linux-gnu g++-aarch64-linux-gnu libc-dev-arm64-cross
-            gcov-exec: aarch64-linux-gnu-gcov
             coverage: ubuntu_gcc_aarch64
 
           - name: Ubuntu GCC AARCH64 Compat No Opt UBSAN
-            os: ubuntu-22.04
-            cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-aarch64.cmake -DZLIB_COMPAT=ON -DWITH_NEW_STRATEGIES=OFF -DWITH_OPTIM=OFF -DWITH_SANITIZER=Undefined
-            packages: qemu-user gcc-aarch64-linux-gnu g++-aarch64-linux-gnu libc-dev-arm64-cross
-            gcov-exec: aarch64-linux-gnu-gcov
+            os: ubuntu-24.04-arm
+            cmake-args: -DZLIB_COMPAT=ON -DWITH_NEW_STRATEGIES=OFF -DWITH_OPTIM=OFF -DWITH_SANITIZER=Undefined
             coverage: ubuntu_gcc_aarch64_compat_no_opt
 
           - name: Ubuntu GCC MIPS
diff --git a/.github/workflows/configure.yml b/.github/workflows/configure.yml
index f45ecd21b8..440cbbb3a9 100644
--- a/.github/workflows/configure.yml
+++ b/.github/workflows/configure.yml
@@ -31,53 +31,49 @@ jobs:
             configure-args: --warn --zlib-compat --sprefix=zTest_
 
           - name: Ubuntu GCC ARM SF
-            os: ubuntu-latest
+            os: ubuntu-24.04-arm
             compiler: arm-linux-gnueabi-gcc
             configure-args: --warn
             chost: arm-linux-gnueabi
             packages: qemu-user gcc-arm-linux-gnueabi libc-dev-armel-cross
 
           - name: Ubuntu GCC ARM SF Compat No Opt No Gzfileops
-            os: ubuntu-latest
+            os: ubuntu-24.04-arm
             compiler: arm-linux-gnueabi-gcc
             configure-args: --warn --zlib-compat --without-optimizations --without-new-strategies --without-gzfileops
             chost: arm-linux-gnueabi
             packages: qemu-user gcc-arm-linux-gnueabi libc-dev-armel-cross
 
           - name: Ubuntu GCC ARM HF
-            os: ubuntu-latest
+            os: ubuntu-24.04-arm
             compiler: arm-linux-gnueabihf-gcc
             configure-args: --warn
             chost: arm-linux-gnueabihf
             packages: qemu-user gcc-arm-linux-gnueabihf libc-dev-armel-cross
 
           - name: Ubuntu GCC ARM HF No Neon No ARMv8
-            os: ubuntu-latest
+            os: ubuntu-24.04-arm
             compiler: arm-linux-gnueabihf-gcc
             configure-args: --warn --without-neon --without-armv8
             chost: arm-linux-gnueabihf
             packages: qemu-user gcc-arm-linux-gnueabihf libc-dev-armel-cross
 
           - name: Ubuntu GCC ARM HF Compat No Opt
-            os: ubuntu-latest
+            os: ubuntu-24.04-arm
             compiler: arm-linux-gnueabihf-gcc
             configure-args: --warn --zlib-compat --without-optimizations --without-new-strategies
             chost: arm-linux-gnueabihf
             packages: qemu-user gcc-arm-linux-gnueabihf libc-dev-armel-cross
 
           - name: Ubuntu GCC AARCH64
-            os: ubuntu-latest
-            compiler: aarch64-linux-gnu-gcc
+            os: ubuntu-24.04-arm
+            compiler: gcc
             configure-args: --warn
-            chost: aarch64-linux-gnu
-            packages: qemu-user gcc-aarch64-linux-gnu libc-dev-arm64-cross
 
           - name: Ubuntu GCC AARCH64 Compat No Opt
-            os: ubuntu-latest
-            compiler: aarch64-linux-gnu-gcc
+            os: ubuntu-24.04-arm
+            compiler: gcc
             configure-args: --warn --zlib-compat --without-optimizations --without-new-strategies
-            chost: aarch64-linux-gnu
-            packages: qemu-user gcc-aarch64-linux-gnu libc-dev-arm64-cross
 
           - name: Ubuntu GCC MIPS
             os: ubuntu-latest
diff --git a/.github/workflows/pigz.yml b/.github/workflows/pigz.yml
index 6272074a65..9cc5ff3e55 100644
--- a/.github/workflows/pigz.yml
+++ b/.github/workflows/pigz.yml
@@ -44,9 +44,7 @@ jobs:
             cmake-args: -DWITH_THREADS=OFF -DPIGZ_VERSION=v2.6
 
           - name: Ubuntu GCC AARCH64
-            os: ubuntu-latest
-            cmake-args: -DCMAKE_TOOLCHAIN_FILE=../../cmake/toolchain-aarch64.cmake
-            packages: qemu-user gcc-aarch64-linux-gnu libc-dev-arm64-cross
+            os: ubuntu-24.04-arm
             coverage: ubuntu_gcc_pigz_aarch64
 
     steps:
diff --git a/.github/workflows/pkgcheck.yml b/.github/workflows/pkgcheck.yml
index dd2f0b47dc..fccb5d98b2 100644
--- a/.github/workflows/pkgcheck.yml
+++ b/.github/workflows/pkgcheck.yml
@@ -24,7 +24,7 @@ jobs:
             ldflags: -m32
 
           - name: Ubuntu GCC ARM HF
-            os: ubuntu-latest
+            os: ubuntu-24.04-arm
             chost: arm-linux-gnueabihf
             compiler: arm-linux-gnueabihf-gcc
             cxx-compiler: arm-linux-gnueabihf-g++
@@ -32,12 +32,9 @@ jobs:
             packages: qemu-user gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf libc6-dev-armhf-cross
 
           - name: Ubuntu GCC AARCH64
-            os: ubuntu-latest
-            chost: aarch64-linux-gnu
-            compiler: aarch64-linux-gnu-gcc
-            cxx-compiler: aarch64-linux-gnu-g++
-            cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-aarch64.cmake
-            packages: qemu-user gcc-aarch64-linux-gnu g++-aarch64-linux-gnu libc6-dev-arm64-cross
+            os: ubuntu-24.04-arm
+            compiler: gcc
+            cxx-compiler: g++
 
           - name: Ubuntu GCC MIPS
             os: ubuntu-latest