From 36cc45782be55b7d9221f0c4e95f3cba1a5998df Mon Sep 17 00:00:00 2001 From: Marc Scholten Date: Tue, 31 May 2016 12:34:59 +0200 Subject: Enabled osx on travis (#15855) --- .travis.yml | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 402347d5eda61..bfd7ca34f6227 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,16 @@ -language: python -python: "3.4" -sudo: required -dist: trusty -before_install: ./maintainers/scripts/travis-nox-review-pr.sh nix +matrix: + include: + - os: linux + language: python + python: "3.4" + sudo: required + dist: trusty + before_install: ./maintainers/scripts/travis-nox-review-pr.sh nix + - os: osx + language: generic + osx_image: xcode7.3 + before_install: + - brew upgrade && brew install python + - ./maintainers/scripts/travis-nox-review-pr.sh nix install: ./maintainers/scripts/travis-nox-review-pr.sh nox script: ./maintainers/scripts/travis-nox-review-pr.sh build -- cgit 1.4.1