diff --git a/.travis.yml b/.travis.yml index 12e4db4f3f..bd3cb5f1b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,15 +7,12 @@ cache: - .build-cache matrix: - allow_failures: - - os: osx include: - os: linux sudo: false env: - SW=$HOME/sw PATH=$SW/bin:$PATH CFLAGS=-I$SW/include LDFLAGS=-L$SW/lib LD_LIBRARY_PATH=$SW/qt/lib:$SW/lib PKG_CONFIG_PATH=$SW/lib/pkgconfig QMAKE=$SW/qt/bin/qmake QT_PLUGIN_PATH=$SW/qt/plugins - os: osx - # osx_image: xcode6.4 env: # On OS X the frameworks/dylibs contain hard coded paths, so we have to re-create the paths in the VM exactly - SWBASE=/Users/kovid SW=$SWBASE/sw PATH=$SW/bin:$SW/qt/bin:$SW/python/Python.framework/Versions/2.7/bin:$PWD/node_modules/.bin:$PATH CFLAGS=-I$SW/include LDFLAGS=-L$SW/lib QMAKE=$SW/qt/bin/qmake QT_PLUGIN_PATH=$SW/qt/plugins