From f7ad177daea3751cf22acc39c60abcf375fa2cbd Mon Sep 17 00:00:00 2001 From: Daniel James Date: Thu, 24 Aug 2017 10:23:09 +0100 Subject: [PATCH 1/3] Use boost 1.65 in travis Also copied some other things that I've found to work well. --- .travis.yml | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2a280e4..6a88164 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,32 +11,37 @@ language: c++ addons: apt: packages: - - libboost-dev - libboost-tools-dev matrix: include: - compiler: gcc - env: BJAM_TOOLSET=gcc-std03 + env: | + USER_CONFIG="using gcc : : g++-4.8 -Werror --std=c++03 ;" - compiler: gcc - env: BJAM_TOOLSET=gcc-std11 + env: | + USER_CONFIG="using gcc : : g++-4.8 -Werror --std=c++11 ;" - compiler: clang - env: BJAM_TOOLSET=clang-std03 + env: | + USER_CONFIG="using clang : : clang++ -Werror --std=c++03 ;" - compiler: clang - env: BJAM_TOOLSET=clang-std11 + env: | + USER_CONFIG="using clang : : clang++ -Werror --std=c++11 ;" - compiler: clang - env: BJAM_TOOLSET=clang-pretend_no_auto_ptr_etc + env: | + USER_CONFIG="using clang : : clang++ -Werror --std=c++11 -D_HAS_AUTO_PTR_ETC=0 ;" before_script: - - | - echo "using gcc : std03 : g++-4.8 -Werror --std=c++03 ;" > ~/user-config.jam - echo "using gcc : std11 : g++-4.8 -Werror --std=c++11 ;" >> ~/user-config.jam - echo "using clang : std03 : clang++ -Werror --std=c++03 ;" >> ~/user-config.jam - echo "using clang : std11 : clang++ -Werror --std=c++11 ;" >> ~/user-config.jam - echo "using clang : pretend_no_auto_ptr_etc : clang++ -Werror --std=c++11 -D_HAS_AUTO_PTR_ETC=0 ;" >> ~/user-config.jam - - cat ~/user-config.jam + - cd ${TRAVIS_BUILD_DIR} - touch Jamroot.jam + - cd $HOME + - echo $USER_CONFIG > ~/user-config.jam + - cat ~/user-config.jam + - wget -O boost.tar.bz2 https://dl.bintray.com/boostorg/release/1.65.0/source/boost_1_65_0.tar.bz2 + - tar -xjf boost.tar.bz2 + - mv boost_1_* boost + - rm -r boost/boost/functional script: - cd ${TRAVIS_BUILD_DIR}/test - - bjam -q ${BJAM_TOOLSET} include=${TRAVIS_BUILD_DIR}/include + - bjam -q ${BJAM_TOOLSET} include=${HOME}/boost include=${TRAVIS_BUILD_DIR}/include From 3ee110f82c8da10e1eba7fa82466c23f01bc2fa1 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Thu, 24 Aug 2017 22:03:19 +0100 Subject: [PATCH 2/3] Download branch snapshot from cron jobs --- .travis.yml | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6a88164..3d26333 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,16 +32,40 @@ matrix: USER_CONFIG="using clang : : clang++ -Werror --std=c++11 -D_HAS_AUTO_PTR_ETC=0 ;" before_script: + - export BOOST_VERSION=1.65.0 + - export BOOST_FILENAME=boost_1_65_0 + - export BOOST_ROOT=${HOME}/boost - cd ${TRAVIS_BUILD_DIR} - touch Jamroot.jam - cd $HOME - echo $USER_CONFIG > ~/user-config.jam - cat ~/user-config.jam - - wget -O boost.tar.bz2 https://dl.bintray.com/boostorg/release/1.65.0/source/boost_1_65_0.tar.bz2 - - tar -xjf boost.tar.bz2 - - mv boost_1_* boost - - rm -r boost/boost/functional + - | + mkdir $HOME/download + mkdir $HOME/extract + cd $HOME/download + if [ "$TRAVIS_EVENT_TYPE" == "cron" ] + then + if [ "$TRAVIS_BRANCH" == "master" ] + then + snapshot_branch=master + else + snapshot_branch=develop + fi + download_url=$(curl https://api.bintray.com/packages/boostorg/$snapshot_branch/snapshot/files | + python -c "import os.path, sys, json; x = json.load(sys.stdin); print '\n'.join(a['path'] for a in x if os.path.splitext(a['path'])[1] == '.bz2')" | + head -n 1 | + sed "s/^/http:\/\/dl.bintray.com\/boostorg\/$snapshot_branch\//") + else + download_url=https://sourceforge.net/projects/boost/files/boost/${BOOST_VERSION}/${BOOST_FILENAME}.tar.bz2/download + fi + echo "Downloading ${download_url}" + wget -O boost.tar.bz2 $download_url + cd $HOME/extract + tar -xjf $HOME/download/boost.tar.bz2 + mv * ${BOOST_ROOT} + - rm -r ${BOOST_ROOT}/boost/functional script: - cd ${TRAVIS_BUILD_DIR}/test - - bjam -q ${BJAM_TOOLSET} include=${HOME}/boost include=${TRAVIS_BUILD_DIR}/include + - bjam -q ${BJAM_TOOLSET} include=${BOOST_ROOT} include=${TRAVIS_BUILD_DIR}/include From 8bdfb0cf908c8ddf40ee4fbb397d866f6cf5a0f2 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Fri, 8 Sep 2017 21:40:16 +0100 Subject: [PATCH 3/3] Use 1.65.1 in travis --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3d26333..c13f8f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,8 +32,8 @@ matrix: USER_CONFIG="using clang : : clang++ -Werror --std=c++11 -D_HAS_AUTO_PTR_ETC=0 ;" before_script: - - export BOOST_VERSION=1.65.0 - - export BOOST_FILENAME=boost_1_65_0 + - export BOOST_VERSION=1.65.1 + - export BOOST_FILENAME=boost_1_65_1 - export BOOST_ROOT=${HOME}/boost - cd ${TRAVIS_BUILD_DIR} - touch Jamroot.jam