From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Mon, 18 Jun 2018 17:50:49 +0000 (+0200)
Subject: travis: Add bionic as target distro
X-Git-Tag: test-travis-01~191
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=4af261c83c6dfd578886afc6da23e5ded067b5c9;ds=sidebyside

travis: Add bionic as target distro

This allows us to test building Quassel against a recent release
of Ubuntu, as well.
---

diff --git a/.travis.yml b/.travis.yml
index 771519eb..316377f2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,8 @@ env:
   - DIST=xenial CXX=g++     CMAKE_OPTIONS="-DWITH_KDE=ON  -DWITH_WEBKIT=ON"
   - DIST=xenial CXX=clang++ CMAKE_OPTIONS="-DWITH_KDE=OFF -DWITH_WEBKIT=ON"
   - DIST=xenial CXX=clang++ CMAKE_OPTIONS="-DWITH_KDE=ON  -DWITH_WEBKIT=ON"
+  - DIST=bionic CXX=clang++ CMAKE_OPTIONS="-DWITH_KDE=OFF -DWITH_WEBENGINE=ON"
+  - DIST=bionic CXX=clang++ CMAKE_OPTIONS="-DWITH_KDE=ON  -DWITH_WEBENGINE=ON"
 
 # Set up cache
 cache:
@@ -35,7 +37,8 @@ script:
                -e CCACHE_DIR=/ccache \
                -e CXX=$CXX \
                quassel/quassel-build-env:$DIST \
-               sh -c "cmake -GNinja /src $CMAKE_OPTIONS \
+               sh -c "cmake /src $CMAKE_OPTIONS \
+                            -GNinja \
                             -DCMAKE_BUILD_TYPE=RelWithDebInfo \
                       && ninja install \
                       && ccache -s \