nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-13 16:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

macOS Travis-ci builds - fallback Qt and Python versions

Browse Source 
[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
This commit is contained in:
Ale Martinez
2020-06-10 20:33:23 -03:00
parent 2418d3b95b
commit 16e00fde90
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
travis/osx/after_success.sh
View File

@@ -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}"

5
travis/osx/before_install.sh
View File

@@ -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