generic-library/g3log
1
0
Fork 0
mirror of https://github.com/KjellKod/g3log.git synced 2025-03-03 04:38:40 +01:00
Code Issues Projects Releases Wiki Activity

key-space issues, fixed1

Browse Source
This commit is contained in:
Kjell Hedström 2016-12-05 23:23:16 -07:00 committed by GitHub
parent aed15716ad
commit 10150e7633
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
.travis.yml
View File

@ -1,5 +1,6 @@
language: cpp language: cpp
sudo: false
os: os:
- linux - linux
@ -21,26 +22,26 @@ before_install:
if [ ${TRAVIS_OS_NAME} = 'linux' ]; if [ ${TRAVIS_OS_NAME} = 'linux' ];
then then
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; add-apt-repository -y ppa:ubuntu-toolchain-r/test;
sudo apt-get update -qq; apt-get update -qq;
sudo apt-get install python-software-properties; apt-get install python-software-properties;
sudo apt-get update; apt-get update;
sudo apt-get install gcc-5 g++-5; apt-get install gcc-5 g++-5;
sudo apt-get install software-properties-common; apt-get install software-properties-common;
# sudo add-apt-repository -y ppa:george-edison55-precise-backports; # sudo add-apt-repository -y ppa:george-edison55-precise-backports;
sudo apt-get update; apt-get update;
sudo apt-get update -qq; apt-get update -qq;
#sudo apt-get install cmake cmake-data; #sudo apt-get install cmake cmake-data;
fi fi
install: install:
# gcc 5 . # gcc 5 .
- if [ "$CXX" == "g++" ]; then sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 10; fi - if [ "$CXX" == "g++" ]; then update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 10; fi
- if [ "$CXX" == "g++" ]; then sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-5 10; fi - if [ "$CXX" == "g++" ]; then update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-5 10; fi
# clang 3.4 # clang 3.4
- if [ "$CXX" == "clang++" ]; then sudo apt-get install --allow-unauthenticated -qq clang-3.4; fi - if [ "$CXX" == "clang++" ]; then apt-get install --allow-unauthenticated -qq clang-3.4; fi
- if [ "$CXX" == "clang++" ]; then sudo apt-get install libc++1 libc++abi-dev || true; fi - if [ "$CXX" == "clang++" ]; then apt-get install libc++1 libc++abi-dev || true; fi
- if [ "$CXX" == "clang++" ]; then export CXXFLAGS="-std=c++0x -stdlib=libc++"; fi - if [ "$CXX" == "clang++" ]; then export CXXFLAGS="-std=c++0x -stdlib=libc++"; fi
- if [ "$CXX" == "clang++" ]; then svn co --quiet http://llvm.org/svn/llvm-project/libcxx/trunk libcxx; fi - if [ "$CXX" == "clang++" ]; then svn co --quiet http://llvm.org/svn/llvm-project/libcxx/trunk libcxx; fi
@ -61,9 +62,10 @@ script: "./scripts/buildAndRunTests.sh"
addons: addons:
apt: apt:
packages:
- cmake
- cmake-data
sources: sources:
- kalakris-cmake - kalakris-cmake
- george-edison55-precise-backports - george-edison55-precise-backports
packages:
- cmake
- cmake-data