summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Pool <mbp@sourcefrog.net>2016-01-10 12:43:41 -0800
committerMartin Pool <mbp@sourcefrog.net>2016-01-10 12:43:41 -0800
commit644d6eb7fe7b1b685606730a1023461b183dc41e (patch)
tree50550a71dd72fc3da1169577d770bda128b0099a
parent35c4b22eff9871dd70c04cb6e20004b613449ff1 (diff)
downloadlibrsync-644d6eb7fe7b1b685606730a1023461b183dc41e.tar.gz
Try using a Travis matrix for Trusty and Ninja
-rw-r--r--.travis.yml21
1 files changed, 16 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index d0d3550..2841b27 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,12 +2,8 @@
language: c
-compiler:
- - gcc
- - clang
-
before_script:
- - cmake .
+ - cmake $CMAKE_GENERATOR .
sudo: false
@@ -22,3 +18,18 @@ script:
- make
- make test
- make doc
+
+matrix:
+ include:
+ - compiler: clang
+ os: osx
+ - compiler: gcc
+ - compiler: clang
+ - compiler: clang
+ sudo: required
+ dist: trusty
+ - compiler: clang
+ env: CMAKE_GENERATOR="-G Ninja"
+ dist: trusty
+
+# TODO: Build Ninja