Skip to content

Commit 056e5f9

Browse files
committed
Merge pull request open-source-parsers#309 from cdunn2001/master
dockerize the Travis build, and allow C++11
2 parents 2428889 + d8e8c14 commit 056e5f9

File tree

1 file changed

+15
-6
lines changed

1 file changed

+15
-6
lines changed

.travis.yml

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,21 @@
22
# http://about.travis-ci.org/docs/user/build-configuration/
33
# This file can be validated on:
44
# http://lint.travis-ci.org/
5+
# See also
6+
# http://stackoverflow.com/questions/22111549/travis-ci-with-clang-3-4-and-c11/30925448#30925448
7+
# to allow C++11, though we are not yet building with -std=c++11
58

6-
#before_install: sudo apt-get install -y cmake
7-
# cmake is pre-installed in Travis for both linux and osx
8-
9-
before_install:
10-
- sudo apt-get update -qq
11-
- sudo apt-get install -qq valgrind
9+
install:
10+
- if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi
11+
addons:
12+
apt:
13+
sources:
14+
- ubuntu-toolchain-r-test
15+
packages:
16+
- gcc-4.8
17+
- g++-4.8
18+
- clang
19+
- valgrind
1220
os:
1321
- linux
1422
language: cpp
@@ -23,3 +31,4 @@ env:
2331
notifications:
2432
email:
2533
34+
sudo: false

0 commit comments

Comments
 (0)