Skip to content

Commit f4e6fcc

Browse files
committed
dockerize the Travis build
Docker builds are *much* faster in Travis. Also, we prepare to enable C++11.
1 parent 2428889 commit f4e6fcc

File tree

1 file changed

+14
-6
lines changed

1 file changed

+14
-6
lines changed

.travis.yml

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,20 @@
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
1219
os:
1320
- linux
1421
language: cpp
@@ -23,3 +30,4 @@ env:
2330
notifications:
2431
email:
2532
33+
sudo: false

0 commit comments

Comments
 (0)