mirror of
https://github.com/open-source-parsers/jsoncpp.git
synced 2025-04-27 18:30:50 +02:00
Merge pull request #309 from cdunn2001/master
dockerize the Travis build, and allow C++11
This commit is contained in:
commit
056e5f9b64
21
.travis.yml
21
.travis.yml
@ -2,13 +2,21 @@
|
|||||||
# http://about.travis-ci.org/docs/user/build-configuration/
|
# http://about.travis-ci.org/docs/user/build-configuration/
|
||||||
# This file can be validated on:
|
# This file can be validated on:
|
||||||
# http://lint.travis-ci.org/
|
# http://lint.travis-ci.org/
|
||||||
|
# See also
|
||||||
|
# http://stackoverflow.com/questions/22111549/travis-ci-with-clang-3-4-and-c11/30925448#30925448
|
||||||
|
# to allow C++11, though we are not yet building with -std=c++11
|
||||||
|
|
||||||
#before_install: sudo apt-get install -y cmake
|
install:
|
||||||
# cmake is pre-installed in Travis for both linux and osx
|
- if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi
|
||||||
|
addons:
|
||||||
before_install:
|
apt:
|
||||||
- sudo apt-get update -qq
|
sources:
|
||||||
- sudo apt-get install -qq valgrind
|
- ubuntu-toolchain-r-test
|
||||||
|
packages:
|
||||||
|
- gcc-4.8
|
||||||
|
- g++-4.8
|
||||||
|
- clang
|
||||||
|
- valgrind
|
||||||
os:
|
os:
|
||||||
- linux
|
- linux
|
||||||
language: cpp
|
language: cpp
|
||||||
@ -23,3 +31,4 @@ env:
|
|||||||
notifications:
|
notifications:
|
||||||
email:
|
email:
|
||||||
- aaronjjacobs@gmail.com
|
- aaronjjacobs@gmail.com
|
||||||
|
sudo: false
|
||||||
|
Loading…
x
Reference in New Issue
Block a user