upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-26 19:34:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Drop the NO_BUILD_TEST_PREREQ hack

Browse source 
With the updated meson, jammy does not need to avoid the
"meson-test-prereq" target.
This commit is contained in:
Michal Nowak 2025-10-08 20:37:24 +02:00
parent 881ecfd8e5
commit c4f3aaeea1
No known key found for this signature in database
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitlab-ci.yml
View file

@ -431,7 +431,7 @@ stages:
- *check_readline_setup
- meson compile -C build
- meson compile -C build system-test-dependencies
- test -z "${NO_BUILD_TEST_PREREQ}" && ninja -C build meson-test-prereq
- ninja -C build meson-test-prereq
- test -z "${RUN_MESON_INSTALL}" || meson install -C build --destdir=$INSTALL_PATH
- test -z "${RUN_MESON_INSTALL}" || DESTDIR="${INSTALL_PATH}" sh build/util/check-make-install.sh
#- test -z "${CROSS_COMPILATION}" || grep -F -A 1 "checking whether we are cross compiling" config.log | grep -q "result.*yes"
@ -1356,7 +1356,6 @@ gcc:jammy:amd64:
CC: gcc
CFLAGS: "${CFLAGS_COMMON}"
EXTRA_CONFIGURE: "-Dgeoip=disabled -Didn=enabled -Ddoh=disabled -Dcmocka=disabled -Ddnstap=disabled -Dgssapi=disabled"
NO_BUILD_TEST_PREREQ: 1 # remove this variable after removing this particular distro
<<: *ubuntu_jammy_amd64_image
<<: *build_job