diff --git a/.travis.yml b/.travis.yml index 4a3f08d..b4cd07a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,23 +16,6 @@ os: linux env: global: - # Autodetect Boost branch by using the following code: - BOOST_BRANCH=$TRAVIS_BRANCH - # or just directly specify it - - BOOST_BRANCH=develop && [ "$TRAVIS_BRANCH" == "master" ] && BOOST_BRANCH=master || true - - # Files, which coverage results must be ignored (files from other projects). - # Example: - IGNORE_COVERAGE='*/boost/progress.hpp */filesystem/src/*' - - IGNORE_COVERAGE='' - - # boost-local/libs/ folder to put this library into. This may be useful, if you're for example running Travis - # from `Boost.DLL` repo while Boost already has `dll` and with to replace `dll` with content of`Boost.DLL`. - # - # Otherwise just leave the default value - BOOST_LIBS_FOLDER=$(basename $TRAVIS_BUILD_DIR) - - BOOST_LIBS_FOLDER=$(basename $TRAVIS_BUILD_DIR) - - # Global options for sanitizers - - UBSAN_OPTIONS=print_stacktrace=1 - - LSAN_OPTIONS=verbosity=1:log_threads=1 # `--coverage` flags required to generate coverage info for Coveralls matrix: @@ -88,22 +71,41 @@ addons: - python-yaml before_install: + # Autodetect Boost branch by using the following code: - BOOST_BRANCH=$TRAVIS_BRANCH + # or just directly specify it + - BOOST_BRANCH=develop && [ "$TRAVIS_BRANCH" == "master" ] && BOOST_BRANCH=master || true + + # Files, which coverage results must be ignored (files from other projects). + # Example: - IGNORE_COVERAGE='*/boost/progress.hpp */filesystem/src/*' + - IGNORE_COVERAGE='' + + # boost-local/libs/ folder to put this library into. This may be useful, if you're for example running Travis + # from `Boost.DLL` repo while Boost already has `dll` and with to replace `dll` with content of`Boost.DLL`. + # + # Otherwise just leave the default value - BOOST_LIBS_FOLDER=$(basename $TRAVIS_BUILD_DIR) + - BOOST_LIBS_FOLDER=$(basename $TRAVIS_BUILD_DIR) + + # Global options for sanitizers + - UBSAN_OPTIONS=print_stacktrace=1 + - LSAN_OPTIONS=verbosity=1:log_threads=1 + # Cloning minimal set of Boost libraries - BOOST=$HOME/boost-local - - git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git $BOOST + - git clone -b $BOOST_BRANCH --depth 10 https://github.com/boostorg/boost.git $BOOST - cd $BOOST - - git submodule update --init --depth 1 tools/build tools/boostdep + - git submodule update --init --depth 10 --jobs 2 tools/build tools/boostdep tools/inspect # Replacing Boost module with this project and installing Boost dependencies - echo "Testing $BOOST/libs/$BOOST_LIBS_FOLDER moved from $TRAVIS_BUILD_DIR, branch $BOOST_BRANCH" - rm -rf $BOOST/libs/$BOOST_LIBS_FOLDER || true - mv $TRAVIS_BUILD_DIR $BOOST/libs/$BOOST_LIBS_FOLDER - - python tools/boostdep/depinst/depinst.py --git_args "--depth 1 --jobs 2" $BOOST_LIBS_FOLDER + - python tools/boostdep/depinst/depinst.py --git_args "--depth 10 --jobs 2" $BOOST_LIBS_FOLDER - git status # Adding missing toolsets and preparing Boost headers - ./bootstrap.sh - ./b2 headers + - ./b2 -j4 variant=debug tools/inspect/build - |- echo "using gcc ;" >> ~/user-config.jam echo "using clang ;" >> ~/user-config.jam @@ -118,6 +120,7 @@ before_install: script: - sh -c "../../../b2 -j2 $B2_ARGS" + - ../../../dist/bin/inspect .. # inspect tool run after_success: # Copying Coveralls data to a separate folder