From 1fae3dddab2ff2237f1f34b1bbd26a60c8987078 Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Tue, 6 Nov 2018 19:20:46 +0000 Subject: [PATCH 1/4] Test adding travis badge. --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index d98d250c..770d25d5 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,8 @@ This library provides configuration support for the Boost C++ libraries. The full documentation is available on [boost.org](http://www.boost.org/doc/libs/release/libs/config/index.html). +[![Build Status](https://travis-ci.org/boostorg/config.png)](https://travis-ci.org/boostorg/config) + ## Support, bugs and feature requests ## Bugs and feature requests can be reported through the [Gitub issue tracker](https://github.com/boostorg/config/issues) From db9b7e36c37e2c3a575f6507114ef7a8faa1c345 Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Tue, 6 Nov 2018 19:31:16 +0000 Subject: [PATCH 2/4] Better CI badges. [CI SKIP] --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 770d25d5..3cca3f6d 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,10 @@ This library provides configuration support for the Boost C++ libraries. The full documentation is available on [boost.org](http://www.boost.org/doc/libs/release/libs/config/index.html). -[![Build Status](https://travis-ci.org/boostorg/config.png)](https://travis-ci.org/boostorg/config) +| | Master | Develop | +|------------------|----------|-------------| +| Travis | [![Build Status](https://travis-ci.org/boostorg/config.svg?branch=master)](https://travis-ci.org/boostorg/config) | [![Build Status](https://travis-ci.org/boostorg/config.png)](https://travis-ci.org/boostorg/config) | +| Appveyor | [![Build status](https://ci.appveyor.com/api/projects/status/wo2n2mhoy8vegmuo/branch/master?svg=true)](https://ci.appveyor.com/project/jzmaddock/config/branch/master) | [![Build status](https://ci.appveyor.com/api/projects/status/wo2n2mhoy8vegmuo/branch/develop?svg=true)](https://ci.appveyor.com/project/jzmaddock/config/branch/develop) | ## Support, bugs and feature requests ## From d5217742dd841a5a0cbc3db518b1523aa9d91e32 Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Wed, 7 Nov 2018 16:12:37 +0000 Subject: [PATCH 3/4] Fix indentation is .travis.yml. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b481255d..f63e6ed6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -251,7 +251,7 @@ matrix: env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z osx_image: xcode6.4 - - os: linux + - os: linux env: CMAKE_TEST_PROJECT=1 install: true script: From 969ff1a974b6fa506ec092c6028b5acfa64826b5 Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Wed, 7 Nov 2018 18:04:56 +0000 Subject: [PATCH 4/4] Remove CMake test - it's apparent I don't understand this. --- .travis.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index f63e6ed6..9692e361 100644 --- a/.travis.yml +++ b/.travis.yml @@ -251,14 +251,6 @@ matrix: env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z osx_image: xcode6.4 - - os: linux - env: CMAKE_TEST_PROJECT=1 - install: true - script: - - mkdir __build__ && cd __build__ - - cmake ../test - - cmake --build . - install: - BOOST_BRANCH=develop && [ "$TRAVIS_BRANCH" == "master" ] && BOOST_BRANCH=master || true - cd ..