Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit970f93c

Browse files
committed
Update Travis Configuration
Use the available precise-packaged Boost installable package, insteadof having to build it ourselves and caching it.We also upgrade to use clang-3.8, as well as re-enable the sanitizerbuilds.
1 parent3183577 commit970f93c

File tree

1 file changed

+12
-24
lines changed

1 file changed

+12
-24
lines changed

‎.travis.yml‎

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -13,33 +13,19 @@ env:
1313
-BOOST_VER=1.59.0 BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="ON" Uri_BUILD_TESTS=OFF Uri_DISABLE_LIBCXX=YES
1414
-BOOST_VER=1.59.0 BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="OFF" Uri_BUILD_TESTS=OFF Uri_DISABLE_LIBCXX=YES
1515
# Support the sanitizers in clang only
16-
#- BOOST_VER=1.59.0 BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="ON" CMAKE_CXX_FLAGS="-fsanitize=thread"
17-
#- BOOST_VER=1.59.0 BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="ON" CMAKE_CXX_FLAGS="-fsanitize=address"
16+
-BOOST_VER=1.59.0 BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="ON" CMAKE_CXX_FLAGS="-fsanitize=thread"
17+
-BOOST_VER=1.59.0 BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="ON" CMAKE_CXX_FLAGS="-fsanitize=address"
1818
# TODO(deanberris): It seems Boost is not msan-clean yet; report bugs and maybe fix?
1919
#- BOOST_VER=1.59.0 BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="ON" CMAKE_CXX_FLAGS="-fsanitize=memory -fsanitize-memory-track-origins=2"
20-
# matrix:
21-
# exclude:
22-
# - compiler: g++
23-
# env: BOOST_VER=1.59.0 BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="ON" CMAKE_CXX_FLAGS="-fsanitize=thread"
24-
# - compiler: g++
25-
# env: BOOST_VER=1.59.0 BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="ON" CMAKE_CXX_FLAGS="-fsanitize=address"
20+
matrix:
21+
exclude:
22+
-compiler:g++
23+
env:BOOST_VER=1.59.0 BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="ON" CMAKE_CXX_FLAGS="-fsanitize=thread"
24+
-compiler:g++
25+
env:BOOST_VER=1.59.0 BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="ON" CMAKE_CXX_FLAGS="-fsanitize=address"
2626
# TODO(deanberris): It seems Boost is not msan-clean yet; report bugs and maybe fix?
2727
# - compiler: g++
2828
# env: BOOST_VER=1.59.0 BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="ON" CMAKE_CXX_FLAGS="-fsanitize=memory -fsanitize-memory-track-origins=2"
29-
install:
30-
-mkdir -p ${HOME}/bin
31-
-if [ "${CC}" = "gcc" ]; then export TOOLSET="gcc"; ln -s `which g++-4.8` ${HOME}/bin/g++;
32-
ln -s `which gcc-4.8` ${HOME}/bin/gcc; fi
33-
-if [ "${CC}" = "clang" ]; then export TOOLSET="clang"; ln -s `which clang-3.6` ${HOME}/bin/clang;
34-
ln -s `which clang++-3.6` ${HOME}/bin/clang++; fi
35-
-export BOOST_VERSION=${BOOST_VER//./_}
36-
-export PATH=${HOME}/bin:${PATH}
37-
-travis_wait ./install-boost.sh
38-
-export BOOST_ROOT=${HOME}/${CC}-boost_${BOOST_VER//./_}
39-
-"${CXX} --version"
40-
cache:
41-
directories:
42-
-"${HOME}/${CC}-boost_${BOOST_VER//./_}"
4329
script:
4430
-pwd
4531
-sh -x build.sh
@@ -49,13 +35,15 @@ addons:
4935
apt:
5036
sources:
5137
-ubuntu-toolchain-r-test
52-
-llvm-toolchain-precise-3.6
38+
-llvm-toolchain-precise-3.8
5339
-kalakris-cmake
40+
-precise
5441
packages:
5542
-gcc-4.8
5643
-g++-4.8
57-
-clang-3.6
44+
-clang-3.8
5845
-cmake
46+
-libboost1.62-all-dev
5947
notifications:
6048
slack:
6149
secure:Y7lLjqZ83+b/jaJ5+EKwvgCDeERi4bVbDn9tLp8sieTdu+ENsPI+JmLYSXZXPpe7JrItrXW6uJJXN2wG1h7au4mpVVTghd31HBzuzrqVxDphWPhp16NYzvbAgQQRBXvFVvfSdW/Kb/n2fX6xDApY0t6vNREb/GKg0GyzESb4ZjU=

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp