summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <smcv@collabora.com>2017-07-25 12:43:40 +0100
committerSimon McVittie <smcv@collabora.com>2017-12-11 15:50:31 +0000
commit333558d67ede6bcf6b8281cb3dcdde336e715450 (patch)
tree1f1fa0ca9a2de9b3b18c7f314ad71657624d2454
parent88b3c319281d988d70253b17d59f7ba687042006 (diff)
travis-ci: Do at least one build with and one without containers
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
-rwxr-xr-xtools/ci-build.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/ci-build.sh b/tools/ci-build.sh
index d0938ee2..33d5ffe1 100755
--- a/tools/ci-build.sh
+++ b/tools/ci-build.sh
@@ -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