From 812b7b9f9d4cbd413294849624e7af7e5394f388 Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Fri, 16 Nov 2018 23:29:56 +0100 Subject: [PATCH] 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. --- .travis.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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: -- 2.20.1