From acfc535cbbbe27744a7a5d1efef052b07ace682b Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Mon, 19 Aug 2024 16:42:48 +0100 Subject: [PATCH 1/2] Install libsasl2-dev to fix build errors with APR trunk/apr-util 1.7.x https://lists.apache.org/thread/8hhs2otod7fo44964yd1csck3ddm1fq2 --- .github/workflows/linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 1f522c8cc68..b4aad1fa82c 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -327,7 +327,7 @@ jobs: cpanminus libtool-bin libapr1-dev libaprutil1-dev liblua5.3-dev libbrotli-dev libcurl4-openssl-dev libnghttp2-dev libjansson-dev libpcre2-dev gdb - perl-doc ${{ matrix.pkgs }} + perl-doc libsasl2-dev ${{ matrix.pkgs }} - uses: actions/checkout@v4 - name: Cache installed libraries uses: actions/cache@v4 From 00e7faaa58328341e69467f2e18f3af2257ef850 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Mon, 19 Aug 2024 17:37:46 +0100 Subject: [PATCH 2/2] Add job to test LDAP with the (apr 1.7.x, apr-util 1.7.x) combination. --- .github/workflows/linux.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index b4aad1fa82c..b1295b8604a 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -171,6 +171,19 @@ jobs: 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