From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Fri, 26 Sep 2025 13:34:49 +0000 (+0200)
Subject: build-and-test-all: Build dnsdist via a release tarball
X-Git-Tag: rec-5.4.0-alpha1~226^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1748c2299f60f6611369e1e4df985292f74093f1;p=thirdparty%2Fpdns.git

build-and-test-all: Build dnsdist via a release tarball

Signed-off-by: Remi Gacogne <remi.gacogne@powerdns.com>
---

diff --git a/tasks.py b/tasks.py
index b1da20bf2a..117f0ab88f 100644
--- a/tasks.py
+++ b/tasks.py
@@ -715,7 +715,7 @@ def ci_dnsdist_configure(c, features, builder, build_dir):
                             -DDISABLE_NPN'
 
     if builder == 'meson':
-        cmd = ci_dnsdist_configure_meson(features, additional_flags, additional_ld_flags, build_dir)
+        cmd = ci_dnsdist_configure_meson(c, features, additional_flags, additional_ld_flags, build_dir)
         logfile = 'meson-logs/meson-log.txt'
     else:
         cmd = ci_dnsdist_configure_autotools(features, additional_flags, additional_ld_flags)
@@ -773,7 +773,7 @@ def ci_dnsdist_configure_autotools(features, additional_flags, additional_ld_fla
         '--prefix=/opt/dnsdist'
     ])
 
-def ci_dnsdist_configure_meson(features, additional_flags, additional_ld_flags, build_dir):
+def ci_dnsdist_configure_meson(c, features, additional_flags, additional_ld_flags, build_dir):
     if features == 'full':
       features_set = '-D cdb=enabled \
                       -D dnscrypt=enabled \
@@ -829,8 +829,15 @@ def ci_dnsdist_configure_meson(features, additional_flags, additional_ld_flags,
         f"CC='{get_c_compiler()}'",
         f"CXX='{get_cxx_compiler()}'",
     ])
+
+    builder_version = os.getenv('BUILDER_VERSION')
+    c.run(f'. {repo_home}/.venv/bin/activate && meson setup /tmp/dnsdist-meson-dist-build && meson dist -C /tmp/dnsdist-meson-dist-build --no-tests')
+    with c.cd('/tmp/dnsdist-meson-dist-build/meson-dist/'):
+        c.run(f'tar xf dnsdist-{builder_version}.tar.xz')
+
+    src_dir = f'/tmp/dnsdist-meson-dist-build/meson-dist/dnsdist-{builder_version}'
     return " ".join([
-        f'. {repo_home}/.venv/bin/activate && {env} meson setup {build_dir}',
+        f'. {repo_home}/.venv/bin/activate && {env} meson setup {build_dir} {src_dir}',
         features_set,
         unittests,
         fuzztargets,