From d26c3966bdf6f0ff0e4b45a678642e5eb6301cb8 Mon Sep 17 00:00:00 2001 From: Peter Lama Date: Sat, 28 Oct 2017 11:01:41 -0700 Subject: [PATCH] Only build Qt5 version for macOS on travis There is no need to continue to build the Qt4 version for macOS since it has usability issues that have been fixed with Qt5 and the fewer macOS builds the better: https://blog.travis-ci.com/2017-09-22-macos-update --- .travis.yml | 35 +++++------------------------------ 1 file changed, 5 insertions(+), 30 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8929a4c4cc..0c50a33656 100755 --- a/.travis.yml +++ b/.travis.yml @@ -64,13 +64,6 @@ matrix: - CMAKE_OPTS="-DBUILD_FEM_NETGEN=ON" QT=Qt5 - PYTHON_MAJOR_VERSION=2 - - os: osx - osx_image: xcode7.3 - compiler: clang - env: - - CMAKE_OPTS="-DBUILD_FEM_NETGEN=ON" QT=Qt4 - - PYTHON_MAJOR_VERSION=2 - git: depth: 5000 @@ -177,30 +170,12 @@ before_install: brew tap FreeCAD/freecad - if [ "${QT}" == "Qt4" ]; then - # Qt4: Replace Qt5 from ports-cache with Qt4, if necessary - brew ls --versions qt@5.6 > /dev/null && \ - brew uninstall --ignore-dependencies --force shiboken pyside pyside-tools qt@5.6 + brew install --verbose --only-dependencies freecad --with-packaging-utils + brew install --verbose --only-dependencies freecad --with-packaging-utils #Ensure all dependencies are satisfied - brew tap cartr/qt4 - - brew install --verbose --only-dependencies freecad --with-qt4 --with-packaging-utils - brew install --verbose --only-dependencies freecad --with-qt4 --with-packaging-utils #Ensure all dependencies are satisfied - # qt4 bottle contains postgresql plugin even when --with-postgresql option is not specified - # and so postgresql dep is not installed. Delete it because the plugin is not included with qt5 bottle. - sudo rm -f /usr/local/lib/qt4/plugins/sqldrivers/libqsqlpsql.dylib - elif [ "${QT}" == "Qt5" ]; then - # Qt5: Replace Qt4 in ports-cache with Qt5, if necessary - brew ls --versions cartr/qt4/qt > /dev/null && \ - brew uninstall --ignore-dependencies --force cartr/qt4/shiboken@1.2 cartr/qt4/pyside@1.2 cartr/qt4/pyside-tools@1.2 cartr/qt4/qt - - brew install --verbose --only-dependencies freecad --with-packaging-utils - brew install --verbose --only-dependencies freecad --with-packaging-utils #Ensure all dependencies are satisfied - - # Qt5: Set Qt5 build flag and CMAKE_PREFIX - QT5_CMAKE_PREFIX=$(ls -d $(brew list -1 | grep qt | tail -1 | xargs brew --cellar)/*/lib/cmake) - CMAKE_OPTS="${CMAKE_OPTS} -DBUILD_QT5=ON -DCMAKE_PREFIX_PATH=${QT5_CMAKE_PREFIX}" - fi + # Qt5: Set Qt5 build flag and CMAKE_PREFIX + QT5_CMAKE_PREFIX=$(ls -d $(brew list -1 | grep qt | tail -1 | xargs brew --cellar)/*/lib/cmake) + CMAKE_OPTS="${CMAKE_OPTS} -DBUILD_QT5=ON -DCMAKE_PREFIX_PATH=${QT5_CMAKE_PREFIX}" #Install the 3DConnexion frameworks if [ "${DEPLOY}" == "1" ]; then