You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jo...@apache.org on 2024/08/21 14:05:50 UTC
svn commit: r1920118 - in /httpd/httpd/branches/2.4.x: ./ .github/workflows/linux.yml
Author: jorton
Date: Wed Aug 21 14:05:50 2024
New Revision: 1920118
URL: http://svn.apache.org/viewvc?rev=1920118&view=rev
Log:
Merge r1920050 from trunk:
CI: Install libsasl2-dev to fix build errors with APR trunk/apr-util 1.7.x
https://lists.apache.org/thread/8hhs2otod7fo44964yd1csck3ddm1fq2
CI: Add job to test LDAP with the (apr 1.7.x, apr-util 1.7.x) combination.
Github: closes #474
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/.github/workflows/linux.yml
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1920050
Modified: httpd/httpd/branches/2.4.x/.github/workflows/linux.yml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/.github/workflows/linux.yml?rev=1920118&r1=1920117&r2=1920118&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/.github/workflows/linux.yml (original)
+++ httpd/httpd/branches/2.4.x/.github/workflows/linux.yml Wed Aug 21 14:05:50 2024
@@ -153,6 +153,20 @@ 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
env: |
@@ -258,7 +272,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