Use ARM64 runners for all ARM-based builds

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index d69e7a9ae78830bcb0cda6a564639d9db4541421..2b8603c8c98e89288cd9a336f2c94c49cbd264c5 100644 (file)
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -136,7 +136,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
@@ -144,14 +144,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
@@ -160,7 +160,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
@@ -168,25 +168,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 704c947aec0db3dea1405972eccdd23e1a566851..7f382a3941fdcbdf06c104d91bd62a053076cd36 100644 (file)
--- a/.github/workflows/configure.yml
+++ b/.github/workflows/configure.yml
@@ -34,53 +34,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 41d00cd559b2efac9aa4d2c751b18eaef5265b25..d616fa34df4164a204f8d112f5e6ae0a36e17d2c 100644 (file)
--- a/.github/workflows/pigz.yml
+++ b/.github/workflows/pigz.yml
@@ -47,9 +47,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 c8d14ceb66a406fcde02a96bad324f07aa12b78a..b341f8815c9f2691e89240c6379accb3b599c21e 100644 (file)
--- a/.github/workflows/pkgcheck.yml
+++ b/.github/workflows/pkgcheck.yml
@@ -27,7 +27,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++
@@ -35,12 +35,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