From ccb7dd482aeb5818787799dd384da8449b8570ee Mon Sep 17 00:00:00 2001 From: Klemens David Morgenstern Date: Mon, 10 Dec 2018 17:23:12 +0700 Subject: [PATCH] implemented badges for OSX / Linux --- .travis.yml | 62 ++++++++++++++++++++++++++++------------------------- README.md | 1 - 2 files changed, 33 insertions(+), 30 deletions(-) diff --git a/.travis.yml b/.travis.yml index d69d726b..1e0655e1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,34 +10,6 @@ # # File revision #6 -env: - - global: - # Autodetect Boost branch by using the following code: - BRANCH_TO_TEST=$TRAVIS_BRANCH - # or just directly specify it - - BRANCH_TO_TEST=$TRAVIS_BRANCH - - # Files, which coverage results must be ignored (files from other projects). - # Example: - IGNORE_COVERAGE='*/boost/progress.hpp */filesystem/src/*' - - IGNORE_COVERAGE='' - - # Explicitly remove the following library from Boost. This may be usefull, if you're for example running Travis - # from `Boost.DLL` repo, while Boost already has `dll`. - # - # By default is eaual to - BOOST_REMOVE=`basename $TRAVIS_BUILD_DIR` - # This will force to use local repo content, instead of the Boost's default - # not needed because process is not yet in boost. - - BOOST_REMOVE=process - - BADGE=linux - - BADGE=osx - matrix: - - CXX_STANDARD=gnu++11 - #- CXX_STANDARD=gnu++1y - exclude: - - os: linux - env: BOOST_TEST_CATCH_SYSTEM_ERRORS=no - - os: osx - env: BADGE=linux ############################################################################################################### # From this point and below code is same for all the Boost libs @@ -51,6 +23,37 @@ os: - linux - osx +env: + - BADGE=linux + - BADGE=osx + +global: + # Autodetect Boost branch by using the following code: - BRANCH_TO_TEST=$TRAVIS_BRANCH + # or just directly specify it + - BRANCH_TO_TEST=$TRAVIS_BRANCH + + # Files, which coverage results must be ignored (files from other projects). + # Example: - IGNORE_COVERAGE='*/boost/progress.hpp */filesystem/src/*' + - IGNORE_COVERAGE='' + + # Explicitly remove the following library from Boost. This may be usefull, if you're for example running Travis + # from `Boost.DLL` repo, while Boost already has `dll`. + # + # By default is eaual to - BOOST_REMOVE=`basename $TRAVIS_BUILD_DIR` + # This will force to use local repo content, instead of the Boost's default + # not needed because process is not yet in boost. + - BOOST_REMOVE=process + - CXX_STANDARD=gnu++11 + +matrix: + exclude: + - os: linux + env: BADGE=osx + - os: osx + env: BADGE=linux + + + # Installing additional tools addons: apt: @@ -68,11 +71,12 @@ before_install: # Set this to the name of the library - PROJECT_TO_TEST=`basename $TRAVIS_BUILD_DIR` - echo "Testing $PROJECT_TO_TEST" - - if [ $TRAVIS_OS_NAME = "osx" ]; then brew install gcc5; brew install valgrind; brew install llvm; TOOLSET=clang; else TOOLSET=gcc-5; fi + - if [ $TRAVIS_OS_NAME = "osx" ]; then brew install gcc5; brew install valgrind; brew install llvm; TOOLSET=clang; BOOST_TEST_CATCH_SYSTEM_ERRORS=no; else TOOLSET=gcc-5; fi # Cloning Boost libraries (fast nondeep cloning) - BOOST=$HOME/boost-local - git init $BOOST - cd $BOOST + - echo Branch to test $BRANCH_TO_TEST - if [ $BRANCH_TO_TEST = "master" ]; then BOOST_BRANCH=master; else BOOST_BRANCH=develop; fi diff --git a/README.md b/README.md index 183c091e..43230893 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,6 @@ Branches | Linux | OSX | Windows | Tests coverage | Matrix | Develop: | [![Build Status](https://travis-ci.org/klemens-morgenstern/boost-process.svg?branch=develop&env=BADGE=linux)](https://travis-ci.org/klemens-morgenstern/boost-process) | [![Build Status](https://travis-ci.org/klemens-morgenstern/boost-process.svg?branch=develop&env=BADGE=osx)](https://travis-ci.org/klemens-morgenstern/boost-process) | [![Build status](https://ci.appveyor.com/api/projects/status/peup7e6m0e1bb5ba?svg=true)](https://ci.appveyor.com/project/klemens-morgenstern/boost-process) | [![Coverage Status](https://coveralls.io/repos/github/klemens-morgenstern/boost-process/badge.svg?branch=develop)](https://coveralls.io/github/klemens-morgenstern/boost-process?branch=develop) | [![Matrix](https://img.shields.io/badge/matrix-develop-lightgray.svg)](http://www.boost.org/development/tests/develop/developer/process.html) Master: | [![Build Status](https://travis-ci.org/klemens-morgenstern/boost-process.svg?branch=master&env=BADGE=linux)](https://travis-ci.org/klemens-morgenstern/boost-process) | [![Build Status](https://travis-ci.org/klemens-morgenstern/boost-process.svg?branch=master&env=BADGE=osx)](https://travis-ci.org/klemens-morgenstern/boost-process) | [![Build status](https://ci.appveyor.com/api/projects/status/peup7e6m0e1bb5ba/branch/master?svg=true)](https://ci.appveyor.com/project/klemens-morgenstern/boost-process/branch/master) | [![Coverage Status](https://coveralls.io/repos/github/klemens-morgenstern/boost-process/badge.svg?branch=master)](https://coveralls.io/github/klemens-morgenstern/boost-process?branch=master) | [![Matrix](https://img.shields.io/badge/matrix-master-lightgray.svg)](http://www.boost.org/development/tests/master/developer/process.html) -env=BADGE=osx [Open Issues](https://github.com/klemens-morgenstern/boost-process/issues)