Commit 5651680b authored by Mario Trangoni's avatar Mario Trangoni Committed by Mike Gabriel

travis.yml: refactor some config options, add gcc-8 and clang-6.0.

parent 913fcf1a
...@@ -9,7 +9,20 @@ matrix: ...@@ -9,7 +9,20 @@ matrix:
addons: addons:
apt: apt:
sources: sources:
- sourceline: 'deb http://archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse'
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
packages:
- cppcheck/trusty-backports
# imake
- xutils-dev
# X11 libaries
- libxcomposite-dev
- libxfont-dev
- libxinerama-dev
- libxrandr-dev
- libxtst-dev
- x11proto-fonts-dev
env: env:
- MATRIX_EVAL="CC=gcc && CXX=g++" - MATRIX_EVAL="CC=gcc && CXX=g++"
- STATIC_ANALYSIS="yes" - STATIC_ANALYSIS="yes"
...@@ -21,19 +34,20 @@ matrix: ...@@ -21,19 +34,20 @@ matrix:
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
packages: packages:
- g++-4.9 - g++-8
env: # imake
- MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9" - xutils-dev
# X11 libaries
- libxcomposite-dev
- libxfont-dev
- libxinerama-dev
- libxrandr-dev
- libxtst-dev
- x11proto-fonts-dev
- os: linux
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-7
env: env:
- MATRIX_EVAL="CC=gcc-7 && CXX=g++-7" - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8"
- STATIC_ANALYSIS="no"
- os: linux - os: linux
addons: addons:
...@@ -42,28 +56,45 @@ matrix: ...@@ -42,28 +56,45 @@ matrix:
- llvm-toolchain-trusty-3.9 - llvm-toolchain-trusty-3.9
packages: packages:
- clang-3.9 - clang-3.9
# imake
- xutils-dev
# X11 libaries
- libxcomposite-dev
- libxfont-dev
- libxinerama-dev
- libxrandr-dev
- libxtst-dev
- x11proto-fonts-dev
env: env:
- MATRIX_EVAL="CC=clang-3.9 && CXX=clang++-3.9" - MATRIX_EVAL="CC=clang-3.9 && CXX=clang++-3.9"
- STATIC_ANALYSIS="no"
- os: linux - os: linux
addons: addons:
apt: apt:
sources: sources:
- llvm-toolchain-trusty-5.0 - llvm-toolchain-trusty-6.0
- ubuntu-toolchain-r-test
packages: packages:
- clang-5.0 - clang-6.0
- g++-4.9
# imake
- xutils-dev
# X11 libaries
- libxcomposite-dev
- libxfont-dev
- libxinerama-dev
- libxrandr-dev
- libxtst-dev
- x11proto-fonts-dev
env: env:
- MATRIX_EVAL="CC=clang-5.0 && CXX=clang++-5.0" - MATRIX_EVAL="CC=clang-6.0 && CXX=clang++-6.0"
- STATIC_ANALYSIS="no"
before_install: before_install:
- sudo apt-get update -qq - eval "${MATRIX_EVAL}"
# cppcheck tool
- sudo apt-get install -y cppcheck/trusty-backports
# imake
- sudo apt-get install -y xutils-dev
# X11 libaries
- sudo apt-get install -y libxcomposite-dev libxfont-dev libxinerama-dev libxrandr-dev libxtst-dev x11proto-fonts-dev
- eval "${MATRIX_EVAL}"
script: script:
# run static analysis tools # run static analysis tools
- ./run-static-analysis.sh - ./run-static-analysis.sh
......
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