Fix .travis.yml

- Use precompiled cmake
- clang + ninja + release build still has a bug. Use make instead.
This commit is contained in:
Soonho Kong 2013-09-15 12:22:20 -07:00
parent 63e102055e
commit 2d8febb7f1

View file

@ -88,20 +88,17 @@ install:
- until sudo add-apt-repository --yes ppa:h-rayflood/llvm; do echo retry; done - until sudo add-apt-repository --yes ppa:h-rayflood/llvm; do echo retry; done
- until sudo add-apt-repository --yes ppa:kalakris/cmake; do echo retry; done - until sudo add-apt-repository --yes ppa:kalakris/cmake; do echo retry; done
- until sudo apt-get -qq update; do echo retry; done - until sudo apt-get -qq update; do echo retry; done
- if [[ $USE_TCMALLOC == TRUE ]]; then until sudo add-apt-repository --yes ppa:agent-8131/ppa && sudo apt-get -qq update && sudo apt-get -qq install libgoogle-perftools-dev; do echo retry; done; fi - if [[ $USE_TCMALLOC == TRUE ]]; then until sudo add-apt-repository --yes ppa:agent-8131/ppa && sudo apt-get -qq update && sudo apt-get -qq install libgoogle-perftools-dev
; do echo retry; done; fi
- until sudo apt-get -qq install libgmp-dev libmpfr-dev; do echo retry; done - until sudo apt-get -qq install libgmp-dev libmpfr-dev; do echo retry; done
- wget http://www.cmake.org/files/v2.8/cmake-2.8.11.2.tar.gz; - until sudo apt-get -qq install cmake python; do echo retry; done
tar xvfz cmake-2.8.11.2.tar.gz; - wget https://dl.dropboxusercontent.com/u/203889738/gcc/cmake-bin.tar.gz;
cd cmake-2.8.11.2; tar xfz cmake-bin.tar.gz;
./configure; sudo cp -v cmake-bin/* /usr/bin;
make;
sudo make install;
cd ..;
- until sudo apt-get -qq install python; do echo retry; done
- wget http://dl.dropboxusercontent.com/u/203889738/gcc/ninja.tar.gz; - wget http://dl.dropboxusercontent.com/u/203889738/gcc/ninja.tar.gz;
tar xfz ninja.tar.gz; tar xfz ninja.tar.gz;
cd ninja; cd ninja;
./bootstrap.py; ./bootstrap.py > /dev/null 2>&1;
sudo cp -v ninja /usr/bin/; sudo cp -v ninja /usr/bin/;
cd ..; cd ..;
- until sudo apt-get -qq install libstdc++-4.8-dev; do echo retry; done - until sudo apt-get -qq install libstdc++-4.8-dev; do echo retry; done
@ -147,7 +144,12 @@ 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 [[ $CMAKE_BUILD_TYPE == RELEASE && $CMAKE_CXX_COMPILER=clang++-3.3 ]];
then
cmake -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} ../src;
else
cmake -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -G Ninja ../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`;