michael/lean2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update .travis.yml

Browse source 
- clang++-3.3 has a bug on travis when it uses ninja for a release-build.
- let's use ninja for memcheck builds and GNU make for the rest of builds.
This commit is contained in:
Soonho Kong 2013-09-15 04:03:26 -07:00
parent c9affe489f
commit e1b4a45f92
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.travis.yml
View file

@ -135,9 +135,11 @@ before_script:
script: script:
- mkdir -p build - mkdir -p build
- cd build - cd build
- cmake -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -G Ninja ../src - if [[ $MEMCHECK == TRUE ]]; then
- CONFIG_FILE=DartConfiguration.tcl; cmake -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -G Ninja ../src;
sed -i "s/^MakeCommand:\(.*\)/MakeCommand:\1 -j 1/" $CONFIG_FILE; else
cmake -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} ../src;
fi
- if [[ $CMAKE_BUILD_TYPE == DEBUG || $CMAKE_BUILD_TYPE == RELEASE || $CMAKE_BUILD_TYPE == TESTCOV ]]; then - if [[ $CMAKE_BUILD_TYPE == DEBUG || $CMAKE_BUILD_TYPE == RELEASE || $CMAKE_BUILD_TYPE == TESTCOV ]]; then
SITE=Ubuntu12.04@Travis; SITE=Ubuntu12.04@Travis;
GIT_COMMIT=`git log --oneline -n 1 | cut -d ' ' -f 1`; GIT_COMMIT=`git log --oneline -n 1 | cut -d ' ' -f 1`;
@ -151,7 +153,7 @@ script:
sed -i "s/^Site:.*/Site:$SITE/" $CONFIG_FILE; sed -i "s/^Site:.*/Site:$SITE/" $CONFIG_FILE;
sed -i "s/BuildName:.*/BuildName:$BUILD_NAME/" $CONFIG_FILE; sed -i "s/BuildName:.*/BuildName:$BUILD_NAME/" $CONFIG_FILE;
if [[ $MEMCHECK == TRUE ]]; then if [[ $MEMCHECK == TRUE ]]; then
ninja -j 1; ninja;
else else
ctest -D ExperimentalConfigure; ctest -D ExperimentalConfigure;
sed -i "s/^Site:.*/Site:$SITE/" $CONFIG_FILE; sed -i "s/^Site:.*/Site:$SITE/" $CONFIG_FILE;