Merge pull request #78 from nickbroon/simplifiy_travis

Simplify the matrix of jobs, without having to explicitly use matrix
master
Oliver Gasser 2017-12-08 21:19:20 +01:00 committed by GitHub
commit cf749462de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 37 deletions

View File

@ -2,41 +2,23 @@ language: cpp
compiler: clang
cache: ccache
matrix:
include:
- os: linux
addons:
apt:
packages:
- cmake
- libboost-dev
- libboost-filesystem-dev
- libboost-regex-dev
- libboost-test-dev
- libboost-thread-dev
- libxml2-dev
- libpcap-dev
- libsystemd-journal-dev
- libsctp-dev
env: DTLS="NO"
- os: linux
addons:
apt:
packages:
- cmake
- libboost-dev
- libboost-filesystem-dev
- libboost-regex-dev
- libboost-test-dev
- libboost-thread-dev
- libxml2-dev
- libpcap-dev
- libsystemd-journal-dev
- libsctp-dev
- libssl-dev
env: DTLS="YES"
fast_finish: true
addons:
apt:
packages:
- cmake
- libboost-dev
- libboost-filesystem-dev
- libboost-regex-dev
- libboost-test-dev
- libboost-thread-dev
- libxml2-dev
- libpcap-dev
- libsystemd-journal-dev
- libsctp-dev
- libssl-dev
script:
- if [[ "$DTLS" == "NO" ]]; then cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DSUPPORT_JOURNALD=ON . && make && make test; fi
- if [[ "$DTLS" == "YES" ]]; then cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DSUPPORT_JOURNALD=ON -DSUPPORT_DTLS=YES . && make && make test; fi
env:
- DTLS="ON"
- DTLS="OFF"
script: cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DSUPPORT_JOURNALD=ON -DSUPPORT_DTLS="$DTLS" . && make && make test