diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-03-01 12:12:58 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-03-01 12:12:58 +0100 |
| commit | 4538d2133a06719c1d07be19b95b5ad3ac9f5800 (patch) | |
| tree | c7ae3ee688c2c83fdddedcafdd677b73c6907a4d | |
| parent | 176f9b471b2ec67dd95e054d9a22ab87c8110b7c (diff) | |
| parent | 440ce3f54b042050afd4c5a49f37ed5ceaaa554f (diff) | |
| download | nx-libs-4538d2133a06719c1d07be19b95b5ad3ac9f5800.tar.gz nx-libs-4538d2133a06719c1d07be19b95b5ad3ac9f5800.tar.bz2 nx-libs-4538d2133a06719c1d07be19b95b5ad3ac9f5800.zip | |
Merge branch 'mjtrangoni-move-to-xenial' into 3.6.x
Attributes GH PR #762: https://github.com/ArcticaProject/nx-libs/pull/762
| -rw-r--r-- | .travis.yml | 37 |
1 files changed, 28 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index bc684b578..108e9bc91 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ -# Use new trusty images, should yield newer compilers and packages +# Use new xenial images, should yield newer compilers and packages sudo: true -dist: trusty +dist: xenial language: cpp matrix: @@ -9,19 +9,24 @@ matrix: addons: apt: sources: - - sourceline: 'deb http://archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse' + - sourceline: 'deb http://archive.ubuntu.com/ubuntu main restricted universe multiverse' - ubuntu-toolchain-r-test packages: - - cppcheck/trusty-backports + - cppcheck # imake - xutils-dev # X11 libaries - libxcomposite-dev + - libxdamage-dev - libxfont-dev - libxinerama-dev + - libxpm-dev - libxrandr-dev - libxtst-dev - x11proto-fonts-dev + # soft requirements + - quilt + - x11-xkb-utils env: - MATRIX_EVAL="CC=gcc && CXX=g++" @@ -39,11 +44,16 @@ matrix: - xutils-dev # X11 libaries - libxcomposite-dev + - libxdamage-dev - libxfont-dev - libxinerama-dev + - libxpm-dev - libxrandr-dev - libxtst-dev - x11proto-fonts-dev + # soft requirements + - quilt + - x11-xkb-utils env: - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" @@ -53,18 +63,23 @@ matrix: addons: apt: sources: - - llvm-toolchain-trusty-3.9 + - llvm-toolchain-xenial-3.9 packages: - clang-3.9 # imake - xutils-dev # X11 libaries - libxcomposite-dev + - libxdamage-dev - libxfont-dev - libxinerama-dev + - libxpm-dev - libxrandr-dev - libxtst-dev - x11proto-fonts-dev + # soft requirements + - quilt + - x11-xkb-utils env: - MATRIX_EVAL="CC=clang-3.9 && CXX=clang++-3.9" @@ -74,23 +89,27 @@ matrix: addons: apt: sources: - - llvm-toolchain-trusty-6.0 + - llvm-toolchain-xenial-7 - ubuntu-toolchain-r-test packages: - - clang-6.0 - - g++-4.9 + - clang-7 # imake - xutils-dev # X11 libaries - libxcomposite-dev + - libxdamage-dev - libxfont-dev - libxinerama-dev + - libxpm-dev - libxrandr-dev - libxtst-dev - x11proto-fonts-dev + # soft requirements + - quilt + - x11-xkb-utils env: - - MATRIX_EVAL="CC=clang-6.0 && CXX=clang++-6.0" + - MATRIX_EVAL="CC=clang-7 && CXX=clang++-7" - STATIC_ANALYSIS="no" before_install: |