From 060b56dc70f2001fef21ab0eb954663feb62d4d0 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Mon, 23 Mar 2020 12:04:30 +1100 Subject: [PATCH] Add jobs for 'configure --with{out}-lmdb' to the GitLab CI We missed a case where LMDB was not installed/used in the build and that broke system tests on such systems. --- .gitlab-ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3f04664718..2096ec31b7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -670,12 +670,13 @@ scan-build: when: on_failure # Jobs for regular GCC builds on Debian Sid (amd64) +# Also tests configration option: --without-lmdb. gcc:sid:amd64: variables: CC: gcc CFLAGS: "${CFLAGS_COMMON} -O3" - EXTRA_CONFIGURE: "--enable-dnstap --with-libidn2" + EXTRA_CONFIGURE: "--enable-dnstap --with-libidn2 --without-lmdb" RUN_MAKE_INSTALL: 1 <<: *debian_sid_amd64_image <<: *build_job @@ -699,13 +700,14 @@ cppcheck: <<: *cppcheck_job # Job for out-of-tree GCC build on Debian Sid (amd64) +# Also tests configration option: --with-lmdb. gcc:out-of-tree: variables: CC: gcc CFLAGS: "${CFLAGS_COMMON} -Og" CONFIGURE: ../configure - EXTRA_CONFIGURE: "--enable-dnstap --with-libidn2" + EXTRA_CONFIGURE: "--enable-dnstap --with-libidn2 --with-lmdb" RUN_MAKE_INSTALL: 1 OOT_BUILD_WORKSPACE: workspace <<: *base_image