travis: Add bionic as target distro
authorManuel Nickschas <sputnick@quassel-irc.org>
Mon, 18 Jun 2018 17:50:49 +0000 (19:50 +0200)
committerManuel Nickschas <sputnick@quassel-irc.org>
Sun, 18 Nov 2018 10:06:43 +0000 (11:06 +0100)
This allows us to test building Quassel against a recent release
of Ubuntu, as well.

.travis.yml

index 771519e..316377f 100644 (file)
@@ -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=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:
 
 # Set up cache
 cache:
@@ -35,7 +37,8 @@ script:
                -e CCACHE_DIR=/ccache \
                -e CXX=$CXX \
                quassel/quassel-build-env:$DIST \
                -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 \
                             -DCMAKE_BUILD_TYPE=RelWithDebInfo \
                       && ninja install \
                       && ccache -s \