Skip to content

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

Merge branch 'mjtrangoni-update-ci' into 3.6.x

Attributes GH PR #924: https://github.com/ArcticaProject/nx-libs/pull/924
parents e91d08cb 099def1d
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 18 deletions
.travis.yml
View file @ 5deb1bc7
# Use new xenial images, should yield newer compilers and packages # Use new bionic images, should yield newer compilers and packages
sudo: true
dist: xenial
language: cpp language: cpp
os: linux
matrix: jobs:
include: include:
- os: linux - name: "GCC 5.4"
dist: xenial
addons: addons:
apt: apt:
sources: sources:
- sourceline: 'deb http://archive.ubuntu.com/ubuntu main restricted universe multiverse'
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
packages: packages:
- cppcheck
# imake # imake
- libxkbfile-dev
- xfonts-utils
- xutils-dev - xutils-dev
# X11 libaries # X11 libaries
- libxcomposite-dev - libxcomposite-dev
...@@ -30,17 +30,20 @@ matrix: ...@@ -30,17 +30,20 @@ matrix:
env: env:
- MATRIX_EVAL="CC=gcc && CXX=g++" - MATRIX_EVAL="CC=gcc && CXX=g++"
- STATIC_ANALYSIS="yes" - STATIC_ANALYSIS="no"
fail_fast: true
- os: linux - name: "cppcheck 1.82 + GCC 10.x"
dist: bionic
addons: addons:
apt: apt:
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
packages: packages:
- g++-9 - cppcheck
- g++-10
# imake # imake
- libxkbfile-dev
- xfonts-utils
- xutils-dev - xutils-dev
# X11 libaries # X11 libaries
- libxcomposite-dev - libxcomposite-dev
...@@ -56,10 +59,11 @@ matrix: ...@@ -56,10 +59,11 @@ matrix:
- x11-xkb-utils - x11-xkb-utils
env: env:
- MATRIX_EVAL="CC=gcc-9 && CXX=g++-9" - MATRIX_EVAL="CC=gcc-10 && CXX=g++-10"
- STATIC_ANALYSIS="no" - STATIC_ANALYSIS="yes"
- os: linux - name: "Clang 3.9"
dist: xenial
addons: addons:
apt: apt:
sources: sources:
...@@ -67,6 +71,8 @@ matrix: ...@@ -67,6 +71,8 @@ matrix:
packages: packages:
- clang-3.9 - clang-3.9
# imake # imake
- libxkbfile-dev
- xfonts-utils
- xutils-dev - xutils-dev
# X11 libaries # X11 libaries
- libxcomposite-dev - libxcomposite-dev
...@@ -85,15 +91,18 @@ matrix: ...@@ -85,15 +91,18 @@ matrix:
- MATRIX_EVAL="CC=clang-3.9 && CXX=clang++-3.9" - MATRIX_EVAL="CC=clang-3.9 && CXX=clang++-3.9"
- STATIC_ANALYSIS="no" - STATIC_ANALYSIS="no"
- os: linux - name: "Clang 9.x"
dist: bionic
addons: addons:
apt: apt:
sources: sources:
- llvm-toolchain-xenial-8 - llvm-toolchain-bionic-9
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
packages: packages:
- clang-8 - clang-9
# imake # imake
- libxkbfile-dev
- xfonts-utils
- xutils-dev - xutils-dev
# X11 libaries # X11 libaries
- libxcomposite-dev - libxcomposite-dev
...@@ -109,7 +118,7 @@ matrix: ...@@ -109,7 +118,7 @@ matrix:
- x11-xkb-utils - x11-xkb-utils
env: env:
- MATRIX_EVAL="CC=clang-8 && CXX=clang++-8" - MATRIX_EVAL="CC=clang-9 && CXX=clang++-9"
- 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