Skip to content

N
nx-libs
Unverified Commit 4538d213 authored by Mike Gabriel's avatar Mike Gabriel
Browse files
Options

Merge branch 'mjtrangoni-move-to-xenial' into 3.6.x

Attributes GH PR #762: https://github.com/ArcticaProject/nx-libs/pull/762
parents 176f9b47 440ce3f5
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 9 deletions
.travis.yml
View file @ 4538d213
# Use new trusty images, should yield newer compilers and packages # Use new xenial images, should yield newer compilers and packages
sudo: true sudo: true
dist: trusty dist: xenial
language: cpp language: cpp
matrix: matrix:
...@@ -9,19 +9,24 @@ matrix: ...@@ -9,19 +9,24 @@ matrix:
addons: addons:
apt: apt:
sources: 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 - ubuntu-toolchain-r-test
packages: packages:
- cppcheck/trusty-backports - cppcheck
# imake # imake
- xutils-dev - xutils-dev
# X11 libaries # X11 libaries
- libxcomposite-dev - libxcomposite-dev
- libxdamage-dev
- libxfont-dev - libxfont-dev
- libxinerama-dev - libxinerama-dev
- libxpm-dev
- libxrandr-dev - libxrandr-dev
- libxtst-dev - libxtst-dev
- x11proto-fonts-dev - x11proto-fonts-dev
# soft requirements
- quilt
- x11-xkb-utils
env: env:
- MATRIX_EVAL="CC=gcc && CXX=g++" - MATRIX_EVAL="CC=gcc && CXX=g++"
...@@ -39,11 +44,16 @@ matrix: ...@@ -39,11 +44,16 @@ matrix:
- xutils-dev - xutils-dev
# X11 libaries # X11 libaries
- libxcomposite-dev - libxcomposite-dev
- libxdamage-dev
- libxfont-dev - libxfont-dev
- libxinerama-dev - libxinerama-dev
- libxpm-dev
- libxrandr-dev - libxrandr-dev
- libxtst-dev - libxtst-dev
- x11proto-fonts-dev - x11proto-fonts-dev
# soft requirements
- quilt
- x11-xkb-utils
env: env:
- MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8"
...@@ -53,18 +63,23 @@ matrix: ...@@ -53,18 +63,23 @@ matrix:
addons: addons:
apt: apt:
sources: sources:
- llvm-toolchain-trusty-3.9 - llvm-toolchain-xenial-3.9
packages: packages:
- clang-3.9 - clang-3.9
# imake # imake
- xutils-dev - xutils-dev
# X11 libaries # X11 libaries
- libxcomposite-dev - libxcomposite-dev
- libxdamage-dev
- libxfont-dev - libxfont-dev
- libxinerama-dev - libxinerama-dev
- libxpm-dev
- libxrandr-dev - libxrandr-dev
- libxtst-dev - libxtst-dev
- x11proto-fonts-dev - x11proto-fonts-dev
# soft requirements
- quilt
- x11-xkb-utils
env: env:
- MATRIX_EVAL="CC=clang-3.9 && CXX=clang++-3.9" - MATRIX_EVAL="CC=clang-3.9 && CXX=clang++-3.9"
...@@ -74,23 +89,27 @@ matrix: ...@@ -74,23 +89,27 @@ matrix:
addons: addons:
apt: apt:
sources: sources:
- llvm-toolchain-trusty-6.0 - llvm-toolchain-xenial-7
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
packages: packages:
- clang-6.0 - clang-7
- g++-4.9
# imake # imake
- xutils-dev - xutils-dev
# X11 libaries # X11 libaries
- libxcomposite-dev - libxcomposite-dev
- libxdamage-dev
- libxfont-dev - libxfont-dev
- libxinerama-dev - libxinerama-dev
- libxpm-dev
- libxrandr-dev - libxrandr-dev
- libxtst-dev - libxtst-dev
- x11proto-fonts-dev - x11proto-fonts-dev
# soft requirements
- quilt
- x11-xkb-utils
env: env:
- MATRIX_EVAL="CC=clang-6.0 && CXX=clang++-6.0" - MATRIX_EVAL="CC=clang-7 && CXX=clang++-7"
- STATIC_ANALYSIS="no" - STATIC_ANALYSIS="no"
before_install: before_install:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment