Merge pull request #412 from lbryio/revert-405-no-more-osx-on-travis

Revert "Remove osx from travis build matrix"
2017-01-16 10:53:56 -06:00 · 2017-01-16 10:53:56 -06:00 · 9fb1cd0944
commit 9fb1cd0944
parent 8a338b37b2 a338d1f0e1
1 changed files with 6 additions and 0 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -7,6 +7,12 @@ matrix:
          # that comes with the system, so we don't want to use anything that
          # travis would try to set-up for us in python
          language: generic
+        - os: osx
+          # Use generic language for osx
+          # python 2.7 is broken on osx on travis, so follow we have to specify the installation ourselves
+          # https://github.com/travis-ci/travis-ci/issues/2312#issuecomment-195620855
+          language: generic
+          osx_image: xcode7.3

 notifications:
  slack: