X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=.travis.yml;h=d123f18d9858ffb425c0258a9f1bdf2921f06b08;hp=ec65a2d31ca473cc0ac5531be26bacd8100f9fa7;hb=1193d9d1f3f7c1c26e2c659b137046a31fe43bb4;hpb=9788cfa5e3cac958a8c4f9e56343c27e396bc8f2

diff --git a/.travis.yml b/.travis.yml
index ec65a2d3..d123f18d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,15 +5,24 @@ services:
 
 # Define build matrix for Linux
 os: linux
+dist: bionic
 language: generic  # No host compilation
 
 env:
-  - DIST=xenial CXX=g++     CMAKE_OPTIONS="-DWITH_KDE=OFF -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"
+  - DIST=ubuntu-xenial  CXX=g++     CMAKE_OPTIONS="-DWITH_KDE=OFF -DWITH_WEBKIT=OFF"
+  - DIST=ubuntu-xenial  CXX=clang++ CMAKE_OPTIONS="-DWITH_KDE=OFF -DWITH_WEBKIT=OFF"
+  - DIST=ubuntu-xenial  CXX=g++     CMAKE_OPTIONS="-DWITH_KDE=ON  -DWITH_WEBKIT=ON"
+  - DIST=ubuntu-xenial  CXX=clang++ CMAKE_OPTIONS="-DWITH_KDE=ON  -DWITH_WEBKIT=ON"
+  - DIST=ubuntu-bionic  CXX=g++     CMAKE_OPTIONS="-DWITH_KDE=ON  -DWITH_WEBKIT=ON"
+  - DIST=ubuntu-bionic  CXX=clang++ CMAKE_OPTIONS="-DWITH_KDE=ON  -DWITH_WEBENGINE=ON"
+  - DIST=ubuntu-eoan    CXX=g++     CMAKE_OPTIONS="-DWITH_KDE=ON  -DWITH_WEBENGINE=ON"
+  - DIST=ubuntu-eoan    CXX=clang++ CMAKE_OPTIONS="-DWITH_KDE=ON  -DWITH_WEBENGINE=ON"
+  - DIST=ubuntu-focal   CXX=g++     CMAKE_OPTIONS="-DWITH_KDE=ON  -DWITH_WEBENGINE=ON"
+  - DIST=ubuntu-focal   CXX=clang++ CMAKE_OPTIONS="-DWITH_KDE=ON  -DWITH_WEBENGINE=ON"
+  - DIST=debian-stable  CXX=g++     CMAKE_OPTIONS="-DWITH_KDE=ON  -DWITH_WEBENGINE=ON"
+  - DIST=debian-stable  CXX=clang++ CMAKE_OPTIONS="-DWITH_KDE=OFF -DWITH_WEBENGINE=ON"
+  - DIST=debian-testing CXX=g++     CMAKE_OPTIONS="-DWITH_KDE=OFF -DWITH_WEBENGINE=ON"
+  - DIST=debian-testing CXX=clang++ CMAKE_OPTIONS="-DWITH_KDE=ON  -DWITH_WEBENGINE=ON"
 
 # Set up cache
 cache:
@@ -35,15 +44,17 @@ script:
                -v "$(readlink -f build):/build" \
                -v "$(readlink -f ccache):/ccache" \
                -e CCACHE_DIR=/ccache \
+               -e CCACHE_MAXSIZE=1G \
                -e CXX=$CXX \
                quassel/quassel-build-env:$DIST \
                sh -c "cmake /src $CMAKE_OPTIONS \
                             -GNinja \
                             -DCMAKE_BUILD_TYPE=RelWithDebInfo \
                             -DBUILD_TESTING=ON \
+                            -DFATAL_WARNINGS=ON \
                       && ninja install \
                       && ccache -s \
-                      && ninja test \
+                      && ctest -VV \
                      "
 
 # Define a separate job for OSX
@@ -60,6 +71,7 @@ jobs:
       before_install:
         - brew update && brew install ccache ninja qca qt5
       script:
+        - export CCACHE_MAXSIZE=1G
         - mkdir build && cd build
         - |
           PATH=$PATH:/usr/local/opt/qt5/bin
@@ -70,7 +82,7 @@ jobs:
           cmake -GNinja .. -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=ON -DDEPLOY=$DEPLOY
           ninja install
         - ccache -s
-        - ninja test
+        - ctest -VV
       deploy:
         provider: releases
         api_key: "${GH_TOKEN}"