CI: Do the CMake native debug build from an Autotools `make dist`

We officially release dbus in the form of Autotools `make dist` tarballs,
but people who have downloaded those tarballs should be able to choose
the CMake build system. Our CI should assert that they can.

(The Autotools debug build already does a `make distcheck`, which
asserts that tarball releases can be used for an Autotools build.)

Signed-off-by: Simon McVittie <smcv@collabora.com>
Resolves: dbus#255
(cherry picked from commit 1063bba06b4e4236350c426d3edf37f069728465)
[backport for 1.12.x: in 1.12.x, `make dist` produces .tar.gz]

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5c88527a58daf8240e5fa432df3eb92eb205e5d5..65f05dade50e8a06bb8eb54486a9b4fe81ae12bb 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -82,7 +82,7 @@ build:cmake:
   stage: build
   image: "debian:stretch-slim"
   variables:
-    ci_buildsys: "cmake"
+    ci_buildsys: "cmake-dist"
   script: *script
 
 build:i686-w64-mingw32-debug:

diff --git a/.travis.yml b/.travis.yml
index 9e68d0130a4a323a6125dbe192a2bdd46a807d52..d16969be338f1276e3913cec760971cbfe6ca13a 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,7 +34,7 @@ env:
   - ci_variant=debug
   - ci_variant=reduced
   - ci_variant=legacy
-  - ci_buildsys=cmake
+  - ci_buildsys=cmake-dist
   - ci_host=i686-w64-mingw32
   - ci_host=i686-w64-mingw32 ci_buildsys=cmake ci_variant=debug
   - ci_host=x86_64-w64-mingw32 ci_variant=debug

diff --git a/tools/ci-build.sh b/tools/ci-build.sh
index f0162f45b92adea6a0b363513f1dfabb738eefd8..d9111dfe335afa1261fdba98cfecd60dd5e18f37 100755 (executable)
--- a/tools/ci-build.sh
+++ b/tools/ci-build.sh
@@ -98,6 +98,19 @@ maybe_fail_tests () {
 
 NOCONFIGURE=1 ./autogen.sh
 
+case "$ci_buildsys" in
+    (cmake-dist)
+        # Do an Autotools `make dist`, then build *that* with CMake,
+        # to assert that our official release tarballs will be enough
+        # to build with CMake.
+        mkdir ci-build-dist
+        ( cd ci-build-dist; ../configure )
+        make -C ci-build-dist dist
+        tar -zxvf ci-build-dist/dbus-1.*.tar.gz
+        cd dbus-1.*/
+        ;;
+esac
+
 srcdir="$(pwd)"
 mkdir ci-build-${ci_variant}-${ci_host}
 cd ci-build-${ci_variant}-${ci_host}
@@ -286,7 +299,7 @@ case "$ci_buildsys" in
         fi
         ;;
 
-    (cmake)
+    (cmake|cmake-dist)
         case "$ci_host" in
             (*-w64-mingw32)
                 set _ "$@"