From d3833f65d4c9c644c810fe00a496784c3a086ad9 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Mon, 29 Sep 2025 11:46:30 +0100 Subject: [PATCH 1/4] CI: Add LMDB coverage, better matrix job naming, 64-bit ARM builds. --- .github/workflows/linux.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 0d109b56..13902d23 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -17,7 +17,7 @@ jobs: fail-fast: false matrix: apr-version: [1.7.x, 1.8.x] - os: [ubuntu-22.04, ubuntu-24.04] + os: [ubuntu-22.04, ubuntu-24.04, ubuntu-22.04-arm] include: - name: APR 1.7.x maintainer-mode apr-version: 1.7.x @@ -36,10 +36,10 @@ jobs: - name: APR 1.7.x Databases + maintainer-mode apr-version: 1.7.x apr-config: --enable-maintainer-mode - config-output: APU_HAVE_SDBM - config: --with-dbm=db5 --with-berkeley-db --with-gdbm --with-ndbm + config-output: APU_HAVE_SDBM APU_HAVE_GDBM APU_HAVE_DB APU_HAVE_NMDB APU_HAVE_LMDB + config: --with-dbm=db5 --with-berkeley-db --with-gdbm --with-ndbm --with-lmdb notest-cflags: -Werror - packages: libdb5.3-dev + packages: libdb5.3-dev liblmdb-dev os: ubuntu-latest - name: APR 1.7.x OpenSSL + maintainer-mode apr-version: 1.7.x @@ -61,7 +61,7 @@ jobs: runs-on: ${{ matrix.os }} env: NOTEST_CFLAGS: ${{ matrix.notest-cflags }} - name: ${{ matrix.name }} + name: ${{ matrix.name && matrix.name || format('APR {0} on {1}', matrix.apr-version, matrix.os) }} steps: - name: Install prerequisites run: sudo apt-get install libtool libtool-bin ${{ matrix.packages }} From a68640007df4691689efe25097eecc752b0ca73b Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Mon, 29 Sep 2025 12:06:37 +0100 Subject: [PATCH 2/4] fixup --- .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 13902d23..9a807078 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -39,7 +39,7 @@ jobs: config-output: APU_HAVE_SDBM APU_HAVE_GDBM APU_HAVE_DB APU_HAVE_NMDB APU_HAVE_LMDB config: --with-dbm=db5 --with-berkeley-db --with-gdbm --with-ndbm --with-lmdb notest-cflags: -Werror - packages: libdb5.3-dev liblmdb-dev + packages: libdb5.3-dev liblmdb-dev libgdbm-dev os: ubuntu-latest - name: APR 1.7.x OpenSSL + maintainer-mode apr-version: 1.7.x From 2ea0f51fc540ca000cfa5dc6a3f579f974728940 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Mon, 29 Sep 2025 12:17:28 +0100 Subject: [PATCH 3/4] fixup --- .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 9a807078..100cdc9c 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -39,7 +39,7 @@ jobs: config-output: APU_HAVE_SDBM APU_HAVE_GDBM APU_HAVE_DB APU_HAVE_NMDB APU_HAVE_LMDB config: --with-dbm=db5 --with-berkeley-db --with-gdbm --with-ndbm --with-lmdb notest-cflags: -Werror - packages: libdb5.3-dev liblmdb-dev libgdbm-dev + packages: libdb5.3-dev liblmdb-dev libgdbm-dev libgdbm-compat-dev os: ubuntu-latest - name: APR 1.7.x OpenSSL + maintainer-mode apr-version: 1.7.x From 125c4ea8e9275335591cee670983262d5cc81557 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Mon, 29 Sep 2025 12:30:33 +0100 Subject: [PATCH 4/4] drop ndbm testing, doesn't work with Debian gdbm? --- .github/workflows/linux.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 100cdc9c..22a90ea3 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -36,8 +36,8 @@ jobs: - name: APR 1.7.x Databases + maintainer-mode apr-version: 1.7.x apr-config: --enable-maintainer-mode - config-output: APU_HAVE_SDBM APU_HAVE_GDBM APU_HAVE_DB APU_HAVE_NMDB APU_HAVE_LMDB - config: --with-dbm=db5 --with-berkeley-db --with-gdbm --with-ndbm --with-lmdb + config-output: APU_HAVE_SDBM APU_HAVE_GDBM APU_HAVE_DB APU_HAVE_LMDB + config: --with-dbm=db5 --with-berkeley-db --with-gdbm --with-lmdb notest-cflags: -Werror packages: libdb5.3-dev liblmdb-dev libgdbm-dev libgdbm-compat-dev os: ubuntu-latest