From 20378ef3636bdf0905582957c7e8237e6a8dc497 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com> Date: Sun, 18 Oct 2015 00:56:37 -0400 Subject: [PATCH] travis: use gnutls 3.2 --- .travis.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 02d1b499..b501d240 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,14 +11,19 @@ compiler: addons: apt: + sources: + - ubuntu-toolchain-r-test packages: - - g++ - - libgnutls-dev + - gcc-4.9 + - g++-4.9 + - libgnutls28-dev + - cmake before_install: - - echo $LANG - - echo $LC_ALL - - if [ $TRAVIS_OS_NAME == linux ]; then git clone https://github.com/msgpack/msgpack-c.git && cd msgpack-c && mkdir build && cmake -DCMAKE_INSTALL_PREFIX=$HOME/usr .. && make -j && make install; fi + - if [ $TRAVIS_OS_NAME == linux ] && [ $CXX == g++ ]; then export CXX=/usr/bin/g++-4.9 && export CC=/usr/bin/gcc-4.9; fi + - if [ $TRAVIS_OS_NAME == linux ]; then git clone https://github.com/msgpack/msgpack-c.git; fi + - if [ $TRAVIS_OS_NAME == linux ]; then cd msgpack-c && git checkout cpp-1.2.0 && mkdir build && mkdir -p $HOME/usr && cd build; fi + - if [ $TRAVIS_OS_NAME == linux ]; then cmake -DCMAKE_INSTALL_PREFIX=$HOME/usr -DMSGPACK_CXX11=ON -DMSGPACK_BUILD_EXAMPLES=OFF .. && make -j && make install && cd ../.. && pwd; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew update && brew install llvm36 && brew install msgpack && brew install gnutls && brew link --force llvm36; fi before_script: -- GitLab