]> git.ipfire.org Git - thirdparty/dbus.git/commitdiff
travis-ci: Do at least one build with and one without containers
authorSimon McVittie <smcv@collabora.com>
Tue, 25 Jul 2017 11:43:40 +0000 (12:43 +0100)
committerSimon McVittie <smcv@collabora.com>
Mon, 11 Dec 2017 15:50:31 +0000 (15:50 +0000)
Signed-off-by: Simon McVittie <smcv@collabora.com>
Reviewed-by: Philip Withnall <withnall@endlessm.com>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=101354

tools/ci-build.sh

index d0938ee22dd475f360aaf22426610e3a8bd65ae6..33d5ffe1dc58b7a2bb249981bddde0e7edba75ff 100755 (executable)
@@ -127,6 +127,7 @@ case "$ci_buildsys" in
                 set "$@" --enable-developer --enable-tests
                 # Enable optional features that are off by default
                 if [ "$ci_host" != mingw ]; then
+                    set "$@" --enable-containers
                     set "$@" --enable-user-session
                 fi
                 shift
@@ -153,6 +154,7 @@ case "$ci_buildsys" in
                 set "$@" --disable-libaudit --without-valgrind
                 # Disable optional features, some of which are on by
                 # default
+                set "$@" --disable-containers
                 set "$@" --disable-stats
                 set "$@" --disable-user-session
                 shift