diff options
| author | Marc Scholten <marcphilipscholten@gmail.com> | 2016-05-31 12:34:59 +0200 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2016-05-31 11:34:59 +0100 |
| commit | 36cc45782be55b7d9221f0c4e95f3cba1a5998df (patch) | |
| tree | b4dde1bb673d4bde1349d9292587173970c9623b /.travis.yml | |
| parent | cf32f82b8d8e8cc0e519e03b62fe77ad96c0232c (diff) | |
Enabled osx on travis (#15855)
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 19 |
1 files changed, 14 insertions, 5 deletions
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 |