Change Travis-ci macOS image to 11.3 and use included Qt5.14.1

Temporary workaround for #3611
[publish binaries]
This commit is contained in:
Ale Martinez
2020-09-23 14:50:09 -03:00
parent 4c19365e8b
commit 5fdf427f39
3 changed files with 5 additions and 5 deletions

View File

@@ -37,7 +37,7 @@ env:
jobs:
include:
- os: osx
osx_image: xcode10.1
osx_image: xcode11.3
compiler: clang
- os: linux
dist: xenial

View File

@@ -67,7 +67,7 @@ aws s3 rm s3://goldencheetah-binaries/MacOS --recursive # keep only the last one
aws s3 cp --acl public-read $FINAL_NAME s3://goldencheetah-binaries/MacOS/$FINAL_NAME
aws s3 cp --acl public-read GCversionMacOS.txt s3://goldencheetah-binaries/MacOS/GCversionMacOS.txt
else
curl --max-time 60 --upload-file $FINAL_NAME https://transfer.sh/$FINAL_NAME
curl --max-time 300 --upload-file $FINAL_NAME https://transfer.sh/$FINAL_NAME
fi
echo "Make sure we are back in the Travis build directory"

View File

@@ -1,14 +1,14 @@
#!/bin/bash
set -ev
## try early just to check, can delete later
date
# Don't update to use included Qt version instead of Qt 5.15.x
export HOMEBREW_NO_AUTO_UPDATE=1
export HOMEBREW_NO_INSTALL_CLEANUP=1
brew update
brew unlink python@2 # to avoid conflicts with qt/libical dependence on python
brew upgrade qt5 # to get 5.15.0
#brew upgrade qt5 # to get 5.15.x
/usr/local/opt/qt5/bin/qmake --version
brew install gsl