From 3252ad1f4bc0e5e15135ec9d42a5dad8bd247db3 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Sun, 18 Mar 2018 15:40:07 +0000 Subject: [PATCH 1/3] Move download-boost-snapshot.py into ci directory Because __boost_check_library__ is complaining about it. --- .appveyor.yml | 2 +- .travis.yml | 2 +- {build => ci}/download-boost-snapshot.py | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename {build => ci}/download-boost-snapshot.py (100%) diff --git a/.appveyor.yml b/.appveyor.yml index ba7290e9..8d141afc 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -18,7 +18,7 @@ environment: install: - set BOOST_ROOT=c:\projects\boost - cd c:\projects\ - - python %APPVEYOR_BUILD_FOLDER%\build\download-boost-snapshot.py master + - python %APPVEYOR_BUILD_FOLDER%\ci\download-boost-snapshot.py master - rd /s /q %BOOST_ROOT%\boost\unordered - cd %BOOST_ROOT%\tools\build - cmd /c bootstrap diff --git a/.travis.yml b/.travis.yml index cc1829f1..fa636c50 100644 --- a/.travis.yml +++ b/.travis.yml @@ -70,7 +70,7 @@ before_script: echo "Downloading ${download_url}" mkdir $HOME/download cd $HOME/download - python ${TRAVIS_BUILD_DIR}/build/download-boost-snapshot.py $snapshot + python ${TRAVIS_BUILD_DIR}/ci/download-boost-snapshot.py $snapshot mv * ${BOOST_ROOT} - rm -r ${BOOST_ROOT}/boost/unordered - cd ${BOOST_ROOT}/tools/build diff --git a/build/download-boost-snapshot.py b/ci/download-boost-snapshot.py similarity index 100% rename from build/download-boost-snapshot.py rename to ci/download-boost-snapshot.py From 6cf03423220e66dc0e27e50140d64e9c39cc66b5 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Sun, 15 Apr 2018 22:11:47 +0100 Subject: [PATCH 2/3] Stop using -Werror So that it doesn't fail for warnings in other libraries. --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index fa636c50..abb00f99 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,24 +19,24 @@ matrix: - compiler: gcc env: | label="gcc C++03/11"; - user_config="using gcc : : g++-4.8 --coverage -fsanitize=address -Werror ;" + user_config="using gcc : : g++-4.8 --coverage -fsanitize=address ;" enable_coverage=1 CXXSTD=03,11 - compiler: gcc env: | label="gcc 32 bit C++11"; - user_config="using gcc : : g++-4.8 -m32 -fsanitize=address -Werror ;" + user_config="using gcc : : g++-4.8 -m32 -fsanitize=address ;" CXXSTD=11 - compiler: clang env: | label="clang C++11/17"; - user_config="using clang : : clang++ -fsanitize=address -Werror ;" + user_config="using clang : : clang++ -fsanitize=address ;" CXXSTD=11,17 # sanitized=address not available for 32-bit clang on travis. - compiler: clang env: | label="clang 32 bit"; - user_config="using clang : : clang++ -m32 -Werror ;" + user_config="using clang : : clang++ -m32 ;" CXXSTD=03 before_install: From f3649e4ae0a86794efc6b0eabbc4f68071eb5c27 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Sun, 15 Apr 2018 22:14:40 +0100 Subject: [PATCH 3/3] Use boost 1.67.0 in tests --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index abb00f99..77815b56 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,8 +43,8 @@ before_install: - if [ -n $enable_coverage ]; then pip install --user cpp-coveralls; fi before_script: - - export BOOST_VERSION=1.66.0 - - export BOOST_FILENAME=boost_1_66_0 + - export BOOST_VERSION=1.67.0 + - export BOOST_FILENAME=boost_1_67_0 - export BOOST_ROOT=${HOME}/boost - cd ${TRAVIS_BUILD_DIR} - touch Jamroot.jam