]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
Configure gcc:bionic job with --without-cmocka
authorMichal Nowak <mnowak@isc.org>
Mon, 14 Aug 2023 13:06:09 +0000 (15:06 +0200)
committerMichal Nowak <mnowak@isc.org>
Mon, 21 Aug 2023 16:02:09 +0000 (18:02 +0200)
Ubuntu "bionic" does not include cmocka version 1.1.3 or higher in its
repositories. Additionally, the custom repository that contains the
library has been discontinued in CI images.

Remove the job unit:gcc:bionic:amd64 as the unit test does not run any
tests without cmocka.

.gitlab-ci.yml

index ff6ecbb3a2a25517f354d08846398fca915b77d7..a27ca094fec49bd3ea42489982caa1fe18cd3cec 100644 (file)
@@ -1021,7 +1021,7 @@ gcc:bionic:amd64:
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON} -O2"
-    EXTRA_CONFIGURE: "--disable-dnstap --with-gssapi"
+    EXTRA_CONFIGURE: "--disable-dnstap --with-gssapi --without-cmocka"
   <<: *ubuntu_bionic_amd64_image
   <<: *build_job
   <<: *api_schedules_tags_triggers_web_triggering_rules
@@ -1034,14 +1034,6 @@ system:gcc:bionic:amd64:
     - job: gcc:bionic:amd64
       artifacts: true
 
-unit:gcc:bionic:amd64:
-  <<: *ubuntu_bionic_amd64_image
-  <<: *unit_test_job
-  <<: *api_schedules_tags_triggers_web_triggering_rules
-  needs:
-    - job: gcc:bionic:amd64
-      artifacts: true
-
 # Jobs for regular GCC builds on Ubuntu 20.04 Focal Fossa (amd64)
 
 gcc:focal:amd64: