X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=.travis.yml;h=d123f18d9858ffb425c0258a9f1bdf2921f06b08;hp=36b1e2f0fa7fff9de3a5a110a818896923a5b4b3;hb=c9d498c1d165c23cb854a8fbe9482a9289029071;hpb=812b7b9f9d4cbd413294849624e7af7e5394f388

diff --git a/.travis.yml b/.travis.yml
index 36b1e2f0..d123f18d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,17 +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=OFF"
-  - DIST=xenial CXX=clang++ CMAKE_OPTIONS="-DWITH_KDE=OFF -DWITH_WEBKIT=OFF"
-  - DIST=xenial CXX=g++     CMAKE_OPTIONS="-DWITH_KDE=ON  -DWITH_WEBKIT=ON"
-  - DIST=xenial CXX=clang++ CMAKE_OPTIONS="-DWITH_KDE=ON  -DWITH_WEBKIT=ON"
-  - DIST=bionic CXX=g++     CMAKE_OPTIONS="-DWITH_KDE=ON  -DWITH_WEBKIT=ON"
-  - DIST=bionic CXX=clang++ CMAKE_OPTIONS="-DWITH_KDE=ON  -DWITH_WEBENGINE=ON"
-  - DIST=cosmic CXX=g++     CMAKE_OPTIONS="-DWITH_KDE=ON  -DWITH_WEBENGINE=ON"
-  - DIST=cosmic 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:
@@ -44,6 +51,7 @@ script:
                             -GNinja \
                             -DCMAKE_BUILD_TYPE=RelWithDebInfo \
                             -DBUILD_TESTING=ON \
+                            -DFATAL_WARNINGS=ON \
                       && ninja install \
                       && ccache -s \
                       && ctest -VV \