Merge r1923271, r1923300, r1923302 from trunk:

CI: Add 64-bit ARM job to Linux workflow. See:
https://github.blog/changelog/2025-01-16-linux-arm64-hosted-runners-now-available-for-free-in-public-repositories-public-preview/

Disable the arm64 job, it appears there are not enough runners.

CI: Retry arm64 workflow with the correct label this time.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1924965 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 8f811382f12e449c3ed57d7a2d4684cff1c529ef..c633a0a6e784a77ada625aca1b9b252119eaece1 100644 (file)
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -53,6 +53,10 @@ jobs:
           - name: Event MPM, all-modules, mod_cgid fdpassing
             config: --enable-mods-shared=reallyall --with-mpm=event --disable-cgi --enable-cgid-fdpassing
           # -------------------------------------------------------------------------
+          - name: Shared MPMs, all-modules, 64-bit ARM
+            config: --enable-mods-shared=reallyall --enable-mpms-shared=all
+            os: ubuntu-24.04-arm
+          # -------------------------------------------------------------------------
           - name: Event MPM, all-modules, mod_cgid w/o fdpassing
             config: --enable-mods-shared=reallyall --with-mpm=event --disable-cgi
           # -------------------------------------------------------------------------
@@ -240,7 +244,7 @@ jobs:
           #     APR_VERSION=1.7.3
           #     APU_VERSION=1.6.3
           # APU_CONFIG="--with-crypto --with-ldap"
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os == '' && 'ubuntu-latest' || matrix.os }}
     timeout-minutes: 30
     env:
       NOTEST_CFLAGS: ${{ matrix.notest-cflags }}