Commit 8747c9b5 authored by Simon McVittie's avatar Simon McVittie

Merge branch 'cmake-dist' into 'master'

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

Closes #255

See merge request !87
parents 402344e8 1063bba0
Pipeline #15799 passed with stage
in 9 minutes and 17 seconds
......@@ -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:
......
......@@ -32,7 +32,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
......
......@@ -101,6 +101,19 @@ maybe_fail_tests () {
# own checks.
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 --xz -xvf ci-build-dist/dbus-1.*.tar.xz
cd dbus-1.*/
;;
esac
srcdir="$(pwd)"
mkdir ci-build-${ci_variant}-${ci_host}
cd ci-build-${ci_variant}-${ci_host}
......@@ -287,7 +300,7 @@ case "$ci_buildsys" in
fi
;;
(cmake)
(cmake|cmake-dist)
case "$ci_host" in
(*-w64-mingw32)
set _ "$@"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment