From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Mon, 14 Oct 2024 19:25:16 +0000 (+0200)
Subject: build-and-test-all: Install meson for dnsdist
X-Git-Tag: dnsdist-2.0.0-alpha1~128^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2405ae7b17f48df5993a0c2af4bacef7aedbdf77;p=thirdparty%2Fpdns.git

build-and-test-all: Install meson for dnsdist
---

diff --git a/.github/workflows/build-and-test-all.yml b/.github/workflows/build-and-test-all.yml
index 6593d9c899..90ae7443ed 100644
--- a/.github/workflows/build-and-test-all.yml
+++ b/.github/workflows/build-and-test-all.yml
@@ -257,6 +257,9 @@ jobs:
           restore-keys: dnsdist-${{ matrix.features }}-${{ matrix.sanitizers }}-${{ matrix.builder}}-ccache-
       - run: inv install-lld-linker-if-needed
         working-directory: ./pdns/dnsdistdist/
+      - run: inv ci-install-meson
+        if: ${{ matrix.builder == 'meson' }}
+        working-directory: ./pdns/dnsdistdist/
       - run: inv ci-install-rust ${{ env.REPO_HOME }}
         working-directory: ./pdns/dnsdistdist/
       - run: inv ci-build-and-install-quiche ${{ env.REPO_HOME }}
diff --git a/tasks.py b/tasks.py
index c4de112ed0..0d9de1cde3 100644
--- a/tasks.py
+++ b/tasks.py
@@ -353,6 +353,10 @@ def install_dnsdist_build_deps(c, skipXDP=False):
     c.sudo('apt-get install -y --no-install-recommends ' +  ' '.join(all_build_deps + git_build_deps + dnsdist_build_deps + (dnsdist_xdp_build_deps if not skipXDP else [])))
     install_meson(c)
 
+@task
+def ci_install_meson(c):
+    install_meson(c)
+
 @task
 def ci_autoconf(c, meson=False):
     if not meson: