Skip to content

Commit

Permalink
BUILD: Update Travis CI config to install g++-7 and Qt
Browse files Browse the repository at this point in the history
  • Loading branch information
DrMcCoy committed Dec 27, 2017
1 parent 97fd1aa commit af6c48e
Showing 1 changed file with 16 additions and 18 deletions.
34 changes: 16 additions & 18 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
sudo: required
sudo: false
dist: trusty

language: cpp
compiler:
- gcc
- clang

env:
global:
Expand All @@ -13,21 +10,21 @@ env:
- secure: "dn5Irr/svB2d/iouvSxxoe2SEAWlPUlkNlGWScngWhqSp+kEJ8p3ubQG0ogCK0vGGHPwUYXfIQvHQ8oSc2Z4na8rIwZqvkJnxYYKvPLZpweKhb+xQbpjPwDwEycFDxT+y7mPnRLKRDtdmcuRqMQh8gnxb6TMY9xqlCCvnTfwTmI="
- coverity_scan_run_condition='\( "$CC" = gcc \) -a \( $USECMAKE -eq 0 \)'
- coverity_scan_script_test_mode=false
matrix:
# Let's test both our autoconf and CMake build system
- USECMAKE=0
- USECMAKE=1

# Only test clang with autotools, not CMake.
# We now have three builds: autoconf+gcc, autoconf+clang, CMake+gcc
matrix:
exclude:
include:
- compiler: gcc
env:
- USECMAKE=0
- MATRIX_EVAL="CXX=g++-7"
- compiler: gcc
env:
- USECMAKE=1
- MATRIX_EVAL="CXX=g++-7"
- compiler: clang
env: USECMAKE=1

before_script:
# The wxWidget version in Trusty won't compile without
- export CXXFLAGS="-std=c++0x"
env:
- USECMAKE=0

script:
# Configure, autotools
Expand All @@ -44,16 +41,17 @@ script:

addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-7
- libboost-all-dev
- libopenal-dev
- libmad0-dev
- libvorbis-dev
- zlib1g-dev
- liblzma-dev
- libwxgtk3.0-dev
- libpango-1.0-0
- libpangocairo-1.0-0
- qtbase5-dev
coverity_scan:
build_script_url: https://raw.githubusercontent.com/$TRAVIS_REPO_SLUG/$TRAVIS_BRANCH/.travis_coverity.sh
project:
Expand Down

0 comments on commit af6c48e

Please sign in to comment.