summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2015-07-12 21:12:11 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2015-07-12 21:12:11 -0700
commit394e6b8c4c393cf2cf244b4f581b356ebfe2d19f (patch)
tree4332c3bde0a901c44d3aa88ea28014ffa27a12b8
parentefeb7093a3e6a96019b0805fc630a7aa4c31481b (diff)
Modified .travis.yml to use new containerized build system.
-rw-r--r--.travis.yml20
1 files changed, 13 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml
index 8e76f06..038dc85 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,6 @@
+# Ensures that sudo is disabled, so that containerized builds are allowed
+sudo: false
+
os:
- linux
- osx
@@ -5,15 +8,18 @@ language: c
compiler:
- clang
- gcc
+addons:
+ apt:
+ # we need a more recent cmake than travis/linux provides (at least 2.8.9):
+ sources:
+ - ppa:kalakris/cmake
+ packages:
+ - cmake
+ - python3
+ - valgrind
before_install:
- # we need a more recent cmake than travis/linux provides (at least 2.8.9):
- |
- if [ ${TRAVIS_OS_NAME:-'linux'} = 'linux' ]
- then
- echo 'yes' | sudo add-apt-repository ppa:kalakris/cmake
- sudo apt-get update -qq
- sudo apt-get install -qq cmake python3 valgrind
- elif [ ${TRAVIS_OS_NAME:-'linux'} = 'osx' ]
+ if [ ${TRAVIS_OS_NAME:-'linux'} = 'osx' ]
then
echo "Building without python3, to make sure that works."
fi