* .github/workflows/linux.yml: Group the APR/APR-util version-variant

  jobs together. No functional change. [skip ci]

Assisted-by: Claude Sonnet 5 <noreply@anthropic.com>
GitHub: PR #701

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1936874 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 68c34e974609db40409fd72e771fb5d6f8422b3b..8e63870a1ddefffa0af64e85d0d8a433811aeb98 100644 (file)
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -98,6 +98,18 @@ jobs:
               APU_VERSION=1.6.3
               APU_CONFIG="--with-crypto --with-ldap"
           # -------------------------------------------------------------------------
+          - name: APR 1.7.6, APR-util 1.6.3, LDAP
+            config: --enable-mods-shared=reallyall
+            pkgs: ldap-utils
+            env: |
+              APR_VERSION=1.7.6
+              APU_VERSION=1.6.3
+              APU_CONFIG="--with-crypto --with-ldap"
+              TEST_MALLOC=1
+              TEST_LDAP=1
+              TEST_ARGS="-defines LDAP"
+              TESTS="t/modules/"
+          # -------------------------------------------------------------------------
           - name: APR 1.8.x, APR-util 1.7.x
             config: --enable-mods-shared=reallyall
             env: |
@@ -106,6 +118,25 @@ jobs:
               APU_CONFIG="--with-crypto --with-ldap"
               CLEAR_CACHE=1
           # -------------------------------------------------------------------------
+          - name: APR 1.7.x, APR-util 1.7.x, LDAP
+            config: --enable-mods-shared=reallyall
+            pkgs: ldap-utils
+            env: |
+              APR_VERSION=1.7.x
+              APU_VERSION=1.7.x
+              APU_CONFIG="--with-crypto --with-ldap"
+              TEST_MALLOC=1
+              TEST_LDAP=1
+              TEST_ARGS="-defines LDAP"
+              TESTS="t/modules/"
+              CLEAR_CACHE=1
+          # -------------------------------------------------------------------------
+          - name: APR trunk thread debugging
+            config: --enable-mods-shared=reallyall --with-mpm=event
+            env: |
+              APR_VERSION=trunk
+              APR_CONFIG="--with-crypto --enable-thread-debug"
+          # -------------------------------------------------------------------------
           - name: Pool-debug
             config: --enable-mods-shared=reallyall
             env: |
@@ -174,38 +205,6 @@ jobs:
               BUILDCONFIG="--with-regen-expr"
               MFLAGS=
           # -------------------------------------------------------------------------
-          - name: APR 1.7.6, APR-util 1.6.3, LDAP
-            config: --enable-mods-shared=reallyall
-            pkgs: ldap-utils
-            env: |
-              APR_VERSION=1.7.6
-              APU_VERSION=1.6.3
-              APU_CONFIG="--with-crypto --with-ldap"
-              TEST_MALLOC=1
-              TEST_LDAP=1
-              TEST_ARGS="-defines LDAP"
-              TESTS="t/modules/"
-          # -------------------------------------------------------------------------
-          - name: APR 1.7.x, APR-util 1.7.x, LDAP
-            config: --enable-mods-shared=reallyall
-            pkgs: ldap-utils
-            env: |
-              APR_VERSION=1.7.x
-              APU_VERSION=1.7.x
-              APU_CONFIG="--with-crypto --with-ldap"
-              TEST_MALLOC=1
-              TEST_LDAP=1
-              TEST_ARGS="-defines LDAP"
-              TESTS="t/modules/"
-              CLEAR_CACHE=1
-          # -------------------------------------------------------------------------
-          ### TODO: if: *condition_not_24x
-          - name: APR trunk thread debugging
-            config: --enable-mods-shared=reallyall --with-mpm=event
-            env: |
-              APR_VERSION=trunk
-              APR_CONFIG="--with-crypto --enable-thread-debug"
-          # -------------------------------------------------------------------------
           - name: UBSan
             notest-cflags: -fsanitize=undefined -fno-sanitize-recover=undefined
             config: --enable-mods-shared=reallyall --disable-http2