From ca59d2605c716efa91f41a2973815ba035b46740 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Mon, 13 Apr 2026 14:32:19 +0100 Subject: [PATCH 1/4] Enable php-fpm and LDAP testing. --- .github/workflows/httpd-build.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/httpd-build.yml b/.github/workflows/httpd-build.yml index 00e6e9c3..13590913 100644 --- a/.github/workflows/httpd-build.yml +++ b/.github/workflows/httpd-build.yml @@ -5,6 +5,12 @@ on: pull_request: workflow_dispatch: +env: + MARGS: "-j2" + CFLAGS: "-g" + # This will need updating as the ubuntu-latest image changes: + PHP_FPM: "/usr/sbin/php-fpm8.3" + jobs: build: name: Test against httpd ${{ matrix.branch }} @@ -50,6 +56,12 @@ jobs: --prefix=$HOME/root/httpd make -j$(nproc) make install + + - name: Prepare containers + run: | + docker build -t httpd_ldap -f httpd/test/travis_Dockerfile_slapd.centos . + ./scripts/ldap-init.sh + - name: Run the test suite run: | eval $(perl -I ~/perl5/lib/perl5/ -Mlocal::lib) From a2d4b147b1e38357616aa50fe1d3ca0d609a13de Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Mon, 13 Apr 2026 14:42:46 +0100 Subject: [PATCH 2/4] fixup --- .github/workflows/httpd-build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/httpd-build.yml b/.github/workflows/httpd-build.yml index 13590913..e1e0f33f 100644 --- a/.github/workflows/httpd-build.yml +++ b/.github/workflows/httpd-build.yml @@ -45,7 +45,8 @@ jobs: cpanm --notest Net::SSL LWP::Protocol::https \ LWP::Protocol::AnyEvent::http ExtUtils::Embed Test::More \ AnyEvent DateTime HTTP::DAV FCGI \ - AnyEvent::WebSocket::Client Apache::Test + AnyEvent::WebSocket::Client Apache::Test \ + ldap-utils - name: Build httpd working-directory: httpd From 2d12fc7ea3324d2f54dabb42d871116b16cf7e0a Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Mon, 13 Apr 2026 14:45:32 +0100 Subject: [PATCH 3/4] fixup --- .github/workflows/httpd-build.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/httpd-build.yml b/.github/workflows/httpd-build.yml index e1e0f33f..95ab9c7f 100644 --- a/.github/workflows/httpd-build.yml +++ b/.github/workflows/httpd-build.yml @@ -37,7 +37,7 @@ jobs: cpanminus libtool-bin libapr1-dev libaprutil1-dev liblua5.3-dev libbrotli-dev libcurl4-openssl-dev libnghttp2-dev libjansson-dev libpcre2-dev - perl-doc libsasl2-dev + perl-doc libsasl2-dev ldap-utils - name: Install Perl dependencies run: | @@ -45,8 +45,7 @@ jobs: cpanm --notest Net::SSL LWP::Protocol::https \ LWP::Protocol::AnyEvent::http ExtUtils::Embed Test::More \ AnyEvent DateTime HTTP::DAV FCGI \ - AnyEvent::WebSocket::Client Apache::Test \ - ldap-utils + AnyEvent::WebSocket::Client Apache::Test - name: Build httpd working-directory: httpd From e9749366550cd41b158e3cb1fde4cb3f44b61eec Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Mon, 13 Apr 2026 14:54:35 +0100 Subject: [PATCH 4/4] fixup --- .github/workflows/httpd-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/httpd-build.yml b/.github/workflows/httpd-build.yml index 95ab9c7f..504e29cd 100644 --- a/.github/workflows/httpd-build.yml +++ b/.github/workflows/httpd-build.yml @@ -65,7 +65,7 @@ jobs: - name: Run the test suite run: | eval $(perl -I ~/perl5/lib/perl5/ -Mlocal::lib) - perl Makefile.PL -apxs $HOME/root/httpd/bin/apxs + perl Makefile.PL -apxs $HOME/root/httpd/bin/apxs -defines LDAP make test