summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorJon Turney <jon.turney@dronecode.org.uk>2017-09-22 15:25:05 +0100
committerEric Anholt <eric@anholt.net>2017-09-23 22:47:36 -0700
commit0b00440678fa22c1c1ca4a292b67db3ab8676969 (patch)
tree7b70d4faf88e31039fdd9b4226bb9e0d9560d6d4 /.travis.yml
parentc30eca688781deb06b25a6a08297cb855aeb6ed2 (diff)
travis: Also build on OSX
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk> Signed-off-by: Eric Anholt <eric@anholt.net> Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml14
1 files changed, 12 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index edeed0d90..a70b55f4c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,19 @@
language: c
cache: ccache
-dist: trusty
-services: docker
+
+matrix:
+ include:
+ - os: linux
+ dist: trusty
+ services: docker
+ - os: osx
before_install:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker pull anholt/xserver-travis ; fi
+install:
+ - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ccache ; fi
+
before_script:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo FROM anholt/xserver-travis:v6 > Dockerfile ; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo ADD . /root >> Dockerfile ; fi
@@ -13,3 +21,5 @@ before_script:
script:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run --volume $HOME/.ccache:/root/.ccache withgit /bin/sh -c "cd /root && ./test/scripts/build-travis-deps.sh" ; fi
+ - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./test/scripts/build-travis-osx.sh ; fi
+ - ccache -s