From: Michal Nowak <mnowak@isc.org>
Date: Mon, 30 May 2022 14:20:53 +0000 (+0200)
Subject: Revert "Build contrib dlz modules in the CI"
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ddb31932bbb80727742ff1ea2e0c9cf6f4a91382;p=thirdparty%2Fbind9.git

Revert "Build contrib dlz modules in the CI"

The libsqlite3-dev package is not present in "bookworm" images and some
unsupported contrib modules won't build.

This reverts commit 8f2f5c426ee9db9340205c1a8ac31f5bb50b2fd0.
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cf303e0d62b..cca877d2890 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -233,9 +233,7 @@ stages:
     - test -n "${SKIP_MAKE_DEPEND}" || make -j${BUILD_PARALLEL_JOBS:-1} depend 2>&1 | tee make-depend.log
     - test -n "${SKIP_MAKE_DEPEND}" || ( ! grep -F "error:" make-depend.log )
     - make -j${BUILD_PARALLEL_JOBS:-1} -k all V=1
-    - test -z "${BUILD_CONTRIB}" || for DIR in contrib/dlz/modules/*; do test -f "${DIR}/Makefile" && make -C "${DIR}"; done
     - test -z "${RUN_MAKE_INSTALL}" || make DESTDIR="${INSTALL_PATH}" install
-    - test -z "${RUN_MAKE_INSTALL}" -o -z "${BUILD_CONTRIB}" || for DIR in contrib/dlz/modules/*; do test -f "${DIR}/Makefile" && make -C "${DIR}" DESTDIR="${INSTALL_PATH}" install; done
     - test -z "${RUN_MAKE_INSTALL}" || DESTDIR="${INSTALL_PATH}" sh util/check-make-install
     - if [[ "${CFLAGS}" == *"-fsanitize=address"* ]]; then ( ! grep -F AddressSanitizer config.log ); fi
     - test -z "${CROSS_COMPILATION}" || grep -F -A 1 "checking whether we are cross compiling" config.log | grep -q "result.*yes"
@@ -658,12 +656,10 @@ unit:gcc:noble:amd64:
 
 gcc:bookworm:amd64:
   variables:
-    BUILD_CONTRIB: 1
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON} --coverage -O0"
     EXTRA_CONFIGURE: "--with-libidn2"
     LDFLAGS: "--coverage"
-    RUN_MAKE_INSTALL: 1
   <<: *debian_bookworm_amd64_image
   <<: *build_job
 
@@ -914,11 +910,9 @@ unit:clang:asan:
 
 clang:bookworm:amd64:
   variables:
-    BUILD_CONTRIB: 1
     CC: ${CLANG}
     CFLAGS: "${CFLAGS_COMMON} -Wenum-conversion"
     EXTRA_CONFIGURE: "--with-python=python3"
-    RUN_MAKE_INSTALL: 1
   <<: *debian_bookworm_amd64_image
   <<: *build_job