generic-library/g3log
1
0
Fork 0
mirror of https://github.com/KjellKod/g3log.git synced 2024-12-13 10:42:56 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into add-levels-only

Browse Source
This commit is contained in:
Andreas Schönle 2016-12-06 11:59:21 +01:00
commit b43848c527
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.travis.yml
View File

@ -3,6 +3,8 @@ language: cpp
os: os:
- linux - linux
dist: trusty
compiler: compiler:
- gcc - gcc
#- clang #- clang
@ -14,22 +16,26 @@ branches:
before_install: before_install:
# use http://lint.travis-ci.org/ to validate changes
# sudo add-apt-repository -y ppa:h-rayflood/llvm;
# sudo apt-get install --allow-unauthenticated -qq clang-3.4
if [ ${TRAVIS_OS_NAME} = 'linux' ]; if [ ${TRAVIS_OS_NAME} = 'linux' ];
then then
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test;
sudo add-apt-repository -y ppa:george-edison55/precise-backports;
sudo apt-get remove -qq cmake cmake-data
sudo apt-get autoremove -qq
sudo apt-get update -qq; sudo apt-get update -qq;
sudo apt-get install python-software-properties; sudo apt-get install python-software-properties;
sudo apt-get update; sudo apt-get update;
sudo apt-get install gcc-5 g++-5; sudo apt-get install gcc-5 g++-5;
sudo apt-get install software-properties-common; sudo apt-get install software-properties-common;
sudo add-apt-repository -y ppa:george-edison55/cmake-3.x;
sudo apt-get update; sudo apt-get update;
sudo apt-get update -qq; sudo apt-get update -qq;
sudo apt-get install cmake; sudo apt-get install cmake cmake-data;
fi fi
install: install:
@ -57,4 +63,6 @@ install:
- echo $PWD - echo $PWD
script: "./scripts/buildAndRunTests.sh" script: "./scripts/buildAndRunTests.sh"