aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Reilly <rs576h@vyatta.att-mail.com>2019-07-17 11:19:39 +0100
committerStuart Reilly <rs576h@vyatta.att-mail.com>2019-07-17 11:44:44 +0100
commit098c4228fb5e0b59077a887215607abd247dc793 (patch)
tree01cf86bd7dff2a7eecc85b729fad7d437ab16c60
parent79a0cfbcdb3b95f7c4d757ea79c84d5a5986e960 (diff)
Make travis more explicit
-rw-r--r--.travis.yml36
1 files changed, 25 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml
index f845b0348..5bce840eb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,24 +1,36 @@
language: c
-os:
- # - osx # tmp disable osx
- - linux
-
-compiler:
- - clang
- - gcc
-
-
matrix:
include:
+ - os: osx
+ compiler: clang
+
- os: linux
compiler: gcc
addons:
apt:
+ packages:
+ - libpcap-dev
+ - autogen
+
+ - os: linux
+ compiler: clang
+ addons:
+ apt:
+ packages:
+ - libpcap-dev
+ - autogen
+
+ - os: linux
+ compiler: gcc-8
+ addons:
+ apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-8
+ - libpcap-dev
+ - autogen
env:
- MATRIX_EVAL="CC=gcc-8 && CXX=g++-8"
@@ -30,6 +42,8 @@ matrix:
- ubuntu-toolchain-r-test
packages:
- g++-9
+ - libpcap-dev
+ - autogen
env:
- MATRIX_EVAL="CC=gcc-9 && CXX=g++-9"
@@ -41,6 +55,8 @@ matrix:
- llvm-toolchain-xenial-8
packages:
- clang-8
+ - libpcap-dev
+ - autogen
env:
- MATRIX_EVAL="CC=clang-8 && CXX=clang++-8"
@@ -57,8 +73,6 @@ before_install:
install:
#macos
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; fi
-#linux
- - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install libpcap-dev autogen; fi
before_script:
- ./autogen.sh