projects / quassel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: efe4239)
travis: Remove Ubuntu Cosmic, add Eoan and Focal
authorManuel Nickschas <sputnick@quassel-irc.org>
Tue, 26 May 2020 16:57:08 +0000 (18:57 +0200)
committerManuel Nickschas <sputnick@quassel-irc.org>
Thu, 11 Jun 2020 11:58:21 +0000 (13:58 +0200)
Remove the EOL'd Ubuntu 18.10 "Cosmic Cattlefish" release, add
Ubuntu 19.10 "Eoan Ermine" and Ubuntu 20.04 LTS "Focal Fossa".

Reflect the change of naming scheme in the quassel-build-env
repository, where branches (and docker tags) are now prefixed
with distro name to prepare for adding additional distros to CI.

.travis.yml patch | blob | history

diff --git a/.travis.yml b/.travis.yml
index 28e76c3..d2139b8 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,14 +9,16 @@ dist: bionic
 language: generic  # No host compilation
 
 env:
 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"
 
 # Set up cache
 cache:
 
 # Set up cache
 cache:
Quassel IRC