From cbcdab6669dc690230c6ce24e0ca8a91355079bf Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Tue, 26 Jan 2016 01:23:19 +0800 Subject: [PATCH 1/2] TravisCI: fix script, add OSX builds --- .travis.yml | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5a205a3..9c6c8eb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,27 @@ -sudo: required -dist: trusty language: c + +os: + - linux + - osx + compiler: - gcc - clang -before_install: - - sudo apt-get install libconfuse-dev - - sudo apt-get install libnl-3-dev libnl-route-3-dev - - sudo apt-get install libncurses-dev -# Change this to your needs -script: ./.travis/run.sh + +# container-based builds +sudo: false +addons: + apt: + packages: + # packages list: https://github.com/travis-ci/apt-package-whitelist/blob/master/ubuntu-precise + - libconfuse-dev + - libncurses5-dev + - libnl-3-dev + - libnl-route-3-dev + + +install: + - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update > /dev/null && brew install confuse ; fi + +script: + - ./.travis/run.sh From 67b6ee3bd6f02fbfe23052d3c05ac93efc348441 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Tue, 26 Jan 2016 01:41:25 +0800 Subject: [PATCH 2/2] TravisCI: merge config for coverity scan --- .travis.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.travis.yml b/.travis.yml index 9c6c8eb..bac4cb1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,10 @@ os: - linux - osx +env: + global: + - secure: "C87Pgf5AVDoyQfm9MIv81g" + compiler: - gcc - clang @@ -18,9 +22,18 @@ addons: - libncurses5-dev - libnl-3-dev - libnl-route-3-dev + coverity_scan: + project: + name: "tgraf/bmon" + description: "bandwidth monitor" + notification_email: tgraf@suug.ch + build_command_prepend: "./autogen.sh && ./configure" + build_command: "make -j2" + branch_pattern: coverity_scan install: + - if [ "$TRAVIS_BRANCH" = "coverity_scan" ] && ! [ "$TRAVIS_OS_NAME" = "linux" -a "$CC" = "gcc" ]; then exit ; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update > /dev/null && brew install confuse ; fi script: