Peter M. Groen / hueplusplus

Commit ce0d821377f747ec11c5358968ef7a6bbce87ac3

Authored by Jojo-1000
Committed by Moritz Wirger
1 parent b1e2b5cc

Update travis distribution to bionic.

Inline Side-by-side
Showing 1 changed file with 5 additions and 11 deletions
.travis.yml
  View file @ce0d821
@@ -3,12 +3,12 @@ language: generic @@ -3,12 +3,12 @@ language: generic
3 env: 3 env:
4 global: 4 global:
5 # Ubuntu version 5 # Ubuntu version
6 - - LINUX_DIST=xenial 6 + - LINUX_DIST=bionic
7 - DEPS_DIR=${TRAVIS_BUILD_DIR}/deps 7 - DEPS_DIR=${TRAVIS_BUILD_DIR}/deps
8 # compiler settings 8 # compiler settings
9 - COMPILER_NAME=gcc 9 - COMPILER_NAME=gcc
10 - - CXX=g++-9  
11 - - CC=gcc-9 10 + - CXX=g++
  11 + - CC=gcc
12 # Misc 12 # Misc
13 - RUN_TESTS=true 13 - RUN_TESTS=true
14 - COVERAGE=false 14 - COVERAGE=false
@@ -17,7 +17,7 @@ env: @@ -17,7 +17,7 @@ env:
17 matrix: 17 matrix:
18 include: 18 include:
19 - os: linux 19 - os: linux
20 - dist: xenial 20 + dist: bionic
21 sudo: true 21 sudo: true
22 compiler: gcc 22 compiler: gcc
23 addons: 23 addons:
@@ -25,14 +25,8 @@ matrix: @@ -25,14 +25,8 @@ matrix:
25 packages: 25 packages:
26 # Misc 26 # Misc
27 - python-yaml 27 - python-yaml
28 - - gcc-5.5  
29 - - g++-5.5  
30 - doxygen 28 - doxygen
31 - graphviz 29 - graphviz
32 - sources: &sources  
33 - - ubuntu-toolchain-r-test  
34 - - llvm-toolchain-xenial-6.0  
35 -  
36 before_install: 30 before_install:
37 # Combine global build options with OS/compiler-dependent options 31 # Combine global build options with OS/compiler-dependent options
38 - export CMAKE_OPTIONS=${CMAKE_OPTIONS}" "${ENV_CMAKE_OPTIONS} 32 - export CMAKE_OPTIONS=${CMAKE_OPTIONS}" "${ENV_CMAKE_OPTIONS}
@@ -42,7 +36,7 @@ before_install: @@ -42,7 +36,7 @@ before_install:
42 36
43 install: 37 install:
44 # CodeCov 38 # CodeCov
45 - - sudo update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-5 90 39 + - sudo update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-7 90
46 # we have to build lcov on our own, because it is not possible to install lcov-1.13 with apt 40 # we have to build lcov on our own, because it is not possible to install lcov-1.13 with apt
47 - wget http://ftp.de.debian.org/debian/pool/main/l/lcov/lcov_1.13.orig.tar.gz && tar xf lcov_1.13.orig.tar.gz && make -C lcov-1.13 "PREFIX=${HOME}/.local" install && export PATH="${PATH}:${HOME}/.local/bin"; 41 - wget http://ftp.de.debian.org/debian/pool/main/l/lcov/lcov_1.13.orig.tar.gz && tar xf lcov_1.13.orig.tar.gz && make -C lcov-1.13 "PREFIX=${HOME}/.local" install && export PATH="${PATH}:${HOME}/.local/bin";
48 # show info 42 # show info