CI: Verify that Autotools `make dist` includes everything needed for Meson

This is similar to what we have done for CMake since dbus/dbus!87
(commit 1063bba "CI: Do the CMake native debug build from an Autotools
`make dist`"). Our official source releases are Autotools `make dist`
tarballs, so our CI should assert that such tarballs contain everything
necessary to do a CMake or Meson build, so that downstream distributions
using our tarballs as source can choose their preferred build system.

When the Meson build system is ready to be recommended as more preferred
than Autotools, we can do as GLib did: stop releasing `make dist`
tarballs, and start releasing `meson dist` tarballs instead (which will
change nothing for Meson or CMake users, but Autotools users will have
to run autoreconf or autogen.sh before building).

Signed-off-by: Simon McVittie <smcv@collabora.com>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e973fd70c1371e90e19490ab98603a4673700c0a..81ccc6f15c3e43b32abca4a9111d09b601840e74 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -181,6 +181,8 @@ debian meson:
   extends:
     - .meson-common
     - .debian-build
+  variables:
+    ci_buildsys: "meson-dist"
 
 debian mingw32 autotools debug:
   extends: .debian-build

diff --git a/tools/ci-build.sh b/tools/ci-build.sh
index 2f309c19c2fd776e031d8957d37e36a654a8e4ff..694fc1284e3a27061782fd4c327599f5820a1523 100755 (executable)
--- a/tools/ci-build.sh
+++ b/tools/ci-build.sh
@@ -181,10 +181,10 @@ rm -rf ci-build-dist
 rm -rf src-from-dist
 
 case "$ci_buildsys" in
-    (cmake-dist)
-        # Do an Autotools `make dist`, then build *that* with CMake,
+    (cmake-dist|meson-dist)
+        # Do an Autotools `make dist`, then build *that* with CMake or Meson,
         # to assert that our official release tarballs will be enough
-        # to build with CMake.
+        # to build with CMake or Meson.
         mkdir -p ci-build-dist
         ( cd ci-build-dist; ../configure )
         make -C ci-build-dist dist
@@ -433,7 +433,7 @@ case "$ci_buildsys" in
         ( cd DESTDIR && find . -ls)
         ;;
 
-    (meson)
+    (meson|meson-dist)
         # The test coverage for OOM-safety is too verbose to be useful on
         # travis-ci, and too slow when running under wine.
         export DBUS_TEST_MALLOC_FAILURES=0