From 39577179f4953f23b3c146cd96ba29821f145eb4 Mon Sep 17 00:00:00 2001 From: Meeh Date: Mon, 14 Jul 2014 06:26:11 +0200 Subject: [PATCH] Trying the multi section setting. https://github.com/travis-ci/travis-ci/issues/216#issuecomment-19430107 --- .travis.yml | 50 +++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 39 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index e33f9e57..cf2dacb6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,22 +2,22 @@ # Documentation: # - http://docs.travis-ci.com/user/build-configuration/#The-Build-Matrix # - http://blog.travis-ci.com/2014-05-13-multi-os-feature-available/ -language: cpp -compiler: gcc os: - linux - - osx +language: + - cpp +compiler: + - gcc branches: only: - master -before_script: - - if [[ "$os" == "linux" ]]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi # GCC 4.7 - - if [[ "$os" == "linux" ]]; then sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu/ quantal main universe"; fi # Boost 1.50 - - if [[ "$os" == "linux" ]]; then sudo apt-get update -qq; fi - - if [[ "$os" == "linux" ]]; then sudo apt-get install -qq libboost1.50-all-dev libcrypto++9 libcrypto++-dev; fi - - if [[ "$os" == "osx" ]]; then brew doctor;brew install boost cryptopp; fi +install: + - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test # GCC 4.7 + - sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu/ quantal main universe" # Boost 1.50 + - sudo apt-get update -qq + - sudo apt-get install -qq libboost1.50-all-dev libcrypto++9 libcrypto++-dev script: - - if [[ "$os" == "osx" ]]; then make -f Makefile.osx; else; make; fi + - make notifications: email: recipients: @@ -28,8 +28,36 @@ notifications: channels: - "irc.freenode.net#i2p-dev" template: - - "%{repository}/%{branch} (%{commit} - %{author}): %{message}" + - "%{repository}/%{branch} [linux] (%{commit} - %{author}): %{message}" on_failure: always on_success: change +--- + +os: + - osx +language: + - cpp +compiler: + - clang +branches: + only: + - master +install: + - brew doctor;brew install boost cryptopp +script: + - make -f Makefile.osx +notifications: + email: + recipients: + - meeh@sigterm.no + on_success: change + on_failure: always + irc: + channels: + - "irc.freenode.net#i2p-dev" + template: + - "%{repository}/%{branch} [osx] (%{commit} - %{author}): %{message}" + on_failure: always + on_success: change