build-and-test-all: No longer run dnsdist autotools build from distdir

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

diff --git a/.github/workflows/build-and-test-all.yml b/.github/workflows/build-and-test-all.yml
index f85aad3113b3e3d6f3bc5d792adf7cb1a5686472..96615848a57e52f9bc7ba23c318f053bd7e171a5 100644 (file)
--- a/.github/workflows/build-and-test-all.yml
+++ b/.github/workflows/build-and-test-all.yml
@@ -289,7 +289,9 @@ jobs:
         working-directory: ./pdns/dnsdistdist/
       - run: ${{ env.INV_CMD }} ci-dnsdist-configure ${{ matrix.features }} ${{ matrix.builder }} dnsdist-${{ env.BUILDER_VERSION }}
         working-directory: ./pdns/dnsdistdist/
-      - run: ${{ env.INV_CMD }} ci-make-distdir
+        if: ${{ matrix.builder != 'autotools' }}
+      - run: |
+          mkdir -p dnsdist-${{ env.BUILDER_VERSION }}
         if: ${{ matrix.builder == 'autotools' }}
         working-directory: ./pdns/dnsdistdist/
       - run: ${{ env.INV_CMD }} ci-dnsdist-configure ${{ matrix.features }} ${{ matrix.builder }} dnsdist-${{ env.BUILDER_VERSION }}

diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml
index 2cc99954c369cb70f6fa1ac73fcc778d6bac8f8c..f47a3b81a388de366f77a1274932f12ba58fd4cb 100644 (file)
--- a/.github/workflows/coverity.yml
+++ b/.github/workflows/coverity.yml
@@ -86,7 +86,7 @@ jobs:
         working-directory: ./pdns/dnsdistdist/
       - run: inv ci-build-and-install-quiche $REPO_HOME
         working-directory: ./pdns/dnsdistdist/
-      - run: inv ci-dnsdist-configure full autotools build-dir
+      - run: inv ci-dnsdist-configure full autotools ''
         working-directory: ./pdns/dnsdistdist/
       - run: inv coverity-make
         working-directory: ./pdns/dnsdistdist/

diff --git a/tasks.py b/tasks.py
index 117f0ab88f56b08d98b80f291a9ac9a37a77aa36..34df1980d2d7a3fe3353fcfde327b84d8628e777 100644 (file)
--- a/tasks.py
+++ b/tasks.py
@@ -470,7 +470,7 @@ def get_cxxflags():
     ])
 
 
-def get_base_configure_cmd(additional_c_flags='', additional_cxx_flags='', additional_ld_flags='', enable_systemd=True, enable_sodium=True):
+def get_base_configure_cmd(additional_c_flags='', additional_cxx_flags='', additional_ld_flags='', enable_systemd=True, enable_sodium=True, out_of_tree_build=False):
     cflags = " ".join([get_cflags(), additional_c_flags])
     cxxflags = " ".join([get_cxxflags(), additional_cxx_flags])
     ldflags = additional_ld_flags
@@ -478,7 +478,7 @@ def get_base_configure_cmd(additional_c_flags='', additional_cxx_flags='', addit
         f'CFLAGS="{cflags}"',
         f'CXXFLAGS="{cxxflags}"',
         f'LDFLAGS="{ldflags}"',
-        './configure',
+        './configure' if not out_of_tree_build else '../configure',
         f"CC='{get_c_compiler()}'",
         f"CXX='{get_cxx_compiler()}'",
         "--enable-option-checking=fatal",
@@ -718,7 +718,7 @@ def ci_dnsdist_configure(c, features, builder, 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)
+        cmd = ci_dnsdist_configure_autotools(features, additional_flags, additional_ld_flags, build_dir)
         logfile = 'config.log'
 
     res = c.run(cmd, warn=True)
@@ -726,7 +726,7 @@ def ci_dnsdist_configure(c, features, builder, build_dir):
         c.run(f'cat {logfile}')
         raise UnexpectedExit(res)
 
-def ci_dnsdist_configure_autotools(features, additional_flags, additional_ld_flags):
+def ci_dnsdist_configure_autotools(features, additional_flags, additional_ld_flags, build_dir):
     if features == 'full':
       features_set = '--enable-dnstap \
                       --enable-dnscrypt \
@@ -763,9 +763,10 @@ def ci_dnsdist_configure_autotools(features, additional_flags, additional_ld_fla
     unittests = get_unit_tests()
     fuzztargets = get_fuzzing_targets()
     tools = f'''AR=llvm-ar-{clang_version} RANLIB=llvm-ranlib-{clang_version}''' if is_compiler_clang() else ''
+    out_of_tree_build = build_dir != ''
     return " ".join([
         tools,
-        get_base_configure_cmd(additional_c_flags='', additional_cxx_flags=additional_flags, additional_ld_flags=additional_ld_flags, enable_systemd=False, enable_sodium=False),
+        get_base_configure_cmd(additional_c_flags='', additional_cxx_flags=additional_flags, additional_ld_flags=additional_ld_flags, enable_systemd=False, enable_sodium=False, out_of_tree_build=out_of_tree_build),
         features_set,
         unittests,
         fuzztargets,