From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Fri, 16 Nov 2018 22:29:56 +0000 (+0100)
Subject: travis: Add Ubuntu 18.10 "Cosmic" to the list of CI distros
X-Git-Tag: test-travis-01~94
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=812b7b9f9d4cbd413294849624e7af7e5394f388;hp=0fcf6adf1ca3a256bd0e5c1db40507874b9d65a8

travis: Add Ubuntu 18.10 "Cosmic" to the list of CI distros

Add Ubuntu 18.10 to the build matrix, so we ensure we can build
on the newest Ubuntu release.

Rework the combination of build options; it's probably enough to
test building without KDE only on the baseline, since the non-KDE
code does not change between distro versions (while the installed
version of KDE Frameworks does). This keeps the number of build
jobs reasonably low.
---

diff --git a/.travis.yml b/.travis.yml
index 4e2efee0..36b1e2f0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,12 +8,14 @@ os: linux
 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=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=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=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"
 
 # Set up cache
 cache: