From 16e00fde908db249053bf83f853e2e07ef82d210 Mon Sep 17 00:00:00 2001 From: Ale Martinez Date: Wed, 10 Jun 2020 20:33:23 -0300 Subject: [PATCH] macOS Travis-ci builds - fallback Qt and Python versions [skip appveyor] Fallback to previous Qt and Python versions available on Homebrew to until we can compile Qwt with Qt 5.15 Python comes back to 3.7.5 since the upgrade to 3.7.7 triggers a Qt upgrade. Qt comes back to 5.13.2 --- travis/osx/after_success.sh | 2 +- travis/osx/before_install.sh | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/travis/osx/after_success.sh b/travis/osx/after_success.sh index a4a043817..a7add2655 100755 --- a/travis/osx/after_success.sh +++ b/travis/osx/after_success.sh @@ -31,7 +31,7 @@ python3.7 -m pip install -r Python/requirements.txt -t GoldenCheetah.app/Content # Fix QtWebEngineProcess due to bug in macdployqt from homebrew pushd GoldenCheetah.app/Contents/Frameworks/QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app/Contents/MacOS -for LIB in QtGui QtCore QtWebEngineCore QtQuick QtWebChannel QtNetwork QtPositioning QtQmlModels QtQml +for LIB in QtGui QtCore QtWebEngineCore QtQuick QtWebChannel QtNetwork QtPositioning #QtQmlModels QtQml required for 5.14.2 do OLD_PATH=`otool -L QtWebEngineProcess | grep ${LIB}.framework | cut -f 1 -d ' '` NEW_PATH="@loader_path/../../../../../../../${LIB}.framework/${LIB}" diff --git a/travis/osx/before_install.sh b/travis/osx/before_install.sh index 7ec4741ab..cdcdb9ae0 100755 --- a/travis/osx/before_install.sh +++ b/travis/osx/before_install.sh @@ -5,8 +5,9 @@ set -ev date brew update brew unlink python@2 # to avoid conflicts with qt/libical dependence on python -brew upgrade python3 # to get 3.7.7 -brew upgrade qt5 # to get 5.14.2 +#brew upgrade python3 # to get 3.7.7, commented out to avoid Qt upgrade +#brew upgrade qt5 # Qt 5.15.0 doesn't allow to build qwt +/usr/local/opt/qt5/bin/qmake --version brew install gsl brew install libical brew upgrade libusb