summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2015-01-12 09:31:12 -0800
committerJohn MacFarlane <jgm@berkeley.edu>2015-01-12 09:31:12 -0800
commit3f02b59874a2a2ac0af4b81008b55b14d95bb70d (patch)
treeacba01eb0240d4049c1805d52edca2d8be880b14
parent4afd26ebd7cee67e71fcf9eeafad381cb34a4680 (diff)
Updated travis script to install osx dependencies using brew.
-rw-r--r--.travis.yml15
1 files changed, 11 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 93e1ae9..6ec5c3f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,10 +6,17 @@ compiler:
- clang
- gcc
before_install:
- # we need a more recent cmake than travis provides (at least 2.8.9):
- - echo "yes" | sudo add-apt-repository ppa:kalakris/cmake
- - sudo apt-get update -qq
- - sudo apt-get install -qq cmake python3 valgrind
+ # 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' ];
+ brew update
+ brew outdated python3 || brew upgrade python3
+ brew outdated valgrind || brew upgrade valgrind
+ fi
script:
- make testtarball
- PROG=`ls cmark-*.*/build/src/cmark` make leakcheck