diff options
| author | Max Kellermann <max@musicpd.org> | 2018-02-16 23:21:14 +0100 |
|---|---|---|
| committer | Max Kellermann <max@musicpd.org> | 2018-02-16 23:21:14 +0100 |
| commit | 081d15a83053113c9a074d83e3bed8679a38eb23 (patch) | |
| tree | fb299f6c7feca9d724f476c1c9c2f3a6d31d95a8 /.travis.yml | |
| parent | d29d186d623441b014e691310face12cbef762a8 (diff) | |
.travis.yml: use "matrix"
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml index f8823c024..b4fcd1425 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,19 @@ -dist: trusty language: cpp -addons: - apt: - packages: - - libcppunit-dev - - libboost-dev +matrix: + include: + - os: linux + dist: trusty + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-5 + - libcppunit-dev + - libboost-dev -os: - - linux - - osx + - os: osx env: global: @@ -17,13 +21,10 @@ env: before_install: # C++14 - - test "$TRAVIS_OS_NAME" != "linux" || sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test - - test "$TRAVIS_OS_NAME" != "linux" || sudo apt-get update -qq - test "$TRAVIS_OS_NAME" != "osx" || brew update install: # C++14 - - test "$TRAVIS_OS_NAME" != "linux" || sudo apt-get install -qq g++-5 - test "$TRAVIS_OS_NAME" != "osx" || brew install cppunit script: |