diff --git a/.github/workflows/httpd-build.yml b/.github/workflows/httpd-build.yml index 00e6e9c3..504e29cd 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 }} @@ -31,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: | @@ -50,10 +56,16 @@ 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) - perl Makefile.PL -apxs $HOME/root/httpd/bin/apxs + perl Makefile.PL -apxs $HOME/root/httpd/bin/apxs -defines LDAP make test