ci: consolidate openldap step into openssl krb5

Closes #17891

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 9c57b4c1252303503214d661fa70bd92069d14fd..1cd143888455f560385305a169576f1de6e31f4f 100644 (file)
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -172,9 +172,10 @@ jobs:
             install_packages: zlib1g-dev libssh-dev valgrind
             configure: CFLAGS=-O3 --with-openssl --enable-debug --with-libssh
 
-          - name: 'openssl clang krb5'
-            install_packages: zlib1g-dev libkrb5-dev clang
-            configure: CC=clang --with-openssl --with-gssapi --enable-debug --disable-docs --disable-manual
+          - name: 'openssl clang krb5 openldap static'
+            install_steps: openldap-static
+            install_packages: zlib1g-dev libkrb5-dev clang libssl-dev
+            configure: CC=clang --disable-shared --with-openssl --with-gssapi --enable-debug --disable-docs --disable-manual --with-ldap=/home/runner/openldap-static --with-ldap-lib=ldap --with-lber-lib=lber
 
           - name: 'openssl clang krb5 LTO'
             install_packages: zlib1g-dev libkrb5-dev clang
@@ -295,11 +296,6 @@ jobs:
             configure: --enable-debug --with-ssl --with-libssh2 --with-libidn2 --with-gssapi --enable-ldap --with-libpsl --disable-threaded-resolver --enable-ares --enable-httpsrr --disable-unity
             container: 'alpine:3.20'
 
-          - name: 'openldap-static'
-            install_steps: openldap-static
-            install_packages: libssl-dev
-            configure: --disable-shared --with-openssl --enable-static --with-ldap=/home/runner/openldap-static --with-ldap-lib=ldap --with-lber-lib=lber
-
     steps:
       - name: 'install prereqs'
         if: ${{ matrix.build.container == null && !contains(matrix.build.name, 'i686') }}