Skip to content

M
mpd
Commit 081d15a8 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

.travis.yml: use "matrix"

parent d29d186d
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 8 deletions
.travis.yml
View file @ 081d15a8
dist: trusty
language: cpp language: cpp
addons: matrix:
include:
- os: linux
dist: trusty
addons:
apt: apt:
sources:
- ubuntu-toolchain-r-test
packages: packages:
- g++-5
- libcppunit-dev - libcppunit-dev
- libboost-dev - libboost-dev
os: - os: osx
- linux
- osx
env: env:
global: global:
...@@ -17,13 +21,10 @@ env: ...@@ -17,13 +21,10 @@ env:
before_install: before_install:
# C++14 # 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 - test "$TRAVIS_OS_NAME" != "osx" || brew update
install: install:
# C++14 # C++14
- test "$TRAVIS_OS_NAME" != "linux" || sudo apt-get install -qq g++-5
- test "$TRAVIS_OS_NAME" != "osx" || brew install cppunit - test "$TRAVIS_OS_NAME" != "osx" || brew install cppunit
script: script:
......
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