From d6e4fab0516af32598faef601751f9b4ce89d0d8 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Sat, 21 May 2016 18:38:05 +0300 Subject: [PATCH 1/9] Add .travis.yml. --- .travis.yml | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..9d43740 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,40 @@ +language: cpp + +os: + - linux + - osx + +branches: + only: + - master + - develop + +install: + - git clone -b %TRAVIS_BRANCH% https://github.com/boostorg/boost.git boost + - cd boost + - git submodule init libs/bind + - git submodule init libs/assert + - git submodule init libs/config + - git submodule init libs/core + - git submodule init libs/function + - git submodule init libs/integer + - git submodule init libs/move + - git submodule init libs/mpl + - git submodule init libs/predef + - git submodule init libs/preprocessor + - git submodule init libs/smart_ptr + - git submodule init libs/static_assert + - git submodule init libs/throw_exception + - git submodule init libs/type_index + - git submodule init libs/type_traits + - git submodule init tools/build + - git submodule init tools/inspect + - git submodule update + - cd libs\bind + - git checkout -q %TRAVIS_COMMIT% + - cd ..\.. + - bootstrap + - b2 headers + +script: + - b2 libs/bind/test toolset=gcc,clang From 36b157c3e8904fd0068cc399f808ed807acc3e9d Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Sat, 21 May 2016 19:00:31 +0300 Subject: [PATCH 2/9] Fix environment variable syntax in .travis.yml. --- .travis.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9d43740..4cc994b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,7 @@ +# Copyright 2016 Peter Dimov +# Distributed under the Boost Software License, Version 1.0. +# (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt) + language: cpp os: @@ -10,7 +14,7 @@ branches: - develop install: - - git clone -b %TRAVIS_BRANCH% https://github.com/boostorg/boost.git boost + - git clone -b $TRAVIS_BRANCH https://github.com/boostorg/boost.git boost - cd boost - git submodule init libs/bind - git submodule init libs/assert @@ -31,7 +35,7 @@ install: - git submodule init tools/inspect - git submodule update - cd libs\bind - - git checkout -q %TRAVIS_COMMIT% + - git checkout -q $TRAVIS_COMMIT - cd ..\.. - bootstrap - b2 headers From 42c1323df9a50b4cd015c5f27ff2b6f220783f47 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Sat, 21 May 2016 19:05:59 +0300 Subject: [PATCH 3/9] Create README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..630c941 --- /dev/null +++ b/README.md @@ -0,0 +1,4 @@ +# bind +Boost.org bind library + +![Travis status][badge.Travis] ![Appveyor status][badge.Appveyor] From ad4ac867ce606a5db2e84e8e546011d62dba3d25 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Sat, 21 May 2016 19:18:38 +0300 Subject: [PATCH 4/9] Update README.md --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 630c941..05221ad 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,7 @@ # bind Boost.org bind library -![Travis status][badge.Travis] ![Appveyor status][badge.Appveyor] +Branch | Travis | Appveyor +---------|--------|--------- +Develop | [![Build Status](https://travis-ci.org/boostorg/bind.svg?branch=develop)](https://travis-ci.org/boostorg/bind) | [![Build Status](https://ci.appveyor.com/api/projects/status/github/boostorg/bind?branch=develop&svg=true)](https://ci.appveyor.com/project/pdimov/bind) +Master | [![Build Status](https://travis-ci.org/boostorg/bind.svg?branch=master)](https://travis-ci.org/boostorg/bind) | [![Build Status](https://ci.appveyor.com/api/projects/status/github/boostorg/bind?branch=master&svg=true)](https://ci.appveyor.com/project/pdimov/bind) From 7a2d6aeaf32e08c2999109ae0d411df2acda9367 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Sat, 21 May 2016 19:20:46 +0300 Subject: [PATCH 5/9] Update README.md --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 05221ad..ebe5553 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ -# bind -Boost.org bind library +# Boost.Bind Branch | Travis | Appveyor ---------|--------|--------- From 154f70cf7a64165dd19bee4bad7364e1455e00ca Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Sat, 21 May 2016 19:44:18 +0300 Subject: [PATCH 6/9] Fix slashes in .travis.yml. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4cc994b..907a382 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,9 +34,9 @@ install: - git submodule init tools/build - git submodule init tools/inspect - git submodule update - - cd libs\bind + - cd libs/bind - git checkout -q $TRAVIS_COMMIT - - cd ..\.. + - cd ../.. - bootstrap - b2 headers From cea67e705b3a03fbd9cc3c8a06bc7e4248fe49eb Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Sat, 21 May 2016 20:27:51 +0300 Subject: [PATCH 7/9] Fix commands in .travis.yml. --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 907a382..0654914 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,8 +37,8 @@ install: - cd libs/bind - git checkout -q $TRAVIS_COMMIT - cd ../.. - - bootstrap - - b2 headers + - ./bootstrap.sh + - ./b2 headers script: - - b2 libs/bind/test toolset=gcc,clang + - ./b2 libs/bind/test toolset=gcc,clang From 8bca02ab4d495f33cb8003a7b7d3c56256f87310 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Sat, 21 May 2016 20:35:02 +0300 Subject: [PATCH 8/9] Add sudo: false to .travis.yml. --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 0654914..b046a35 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,8 @@ language: cpp +sudo: false + os: - linux - osx From b3e40992ca59b9d51b27306435a572f2bcbe0e35 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Sat, 21 May 2016 21:38:57 +0300 Subject: [PATCH 9/9] Do not use the gcc toolset on Travis OS X --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b046a35..8672ce3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,4 +43,6 @@ install: - ./b2 headers script: - - ./b2 libs/bind/test toolset=gcc,clang + - TOOLSET=gcc,clang + - if [ $TRAVIS_OS_NAME == osx ]; then TOOLSET=clang; fi + - ./b2 libs/bind/test toolset=$TOOLSET