fix macOS Travis CI

This commit is contained in:
Le Tan 2019-03-05 18:48:51 +08:00
parent fcfc1ca976
commit 470a40c80b
2 changed files with 21 additions and 13 deletions

View File

@ -8,7 +8,7 @@ matrix:
include: include:
- os: osx - os: osx
compiler: clang compiler: clang
osx_image: xcode8 osx_image: xcode9.4
- os: linux - os: linux
compiler: g++ compiler: g++

View File

@ -10,23 +10,31 @@ fi
brew update > /dev/null brew update > /dev/null
# Use Qt5.9.3 instead of 5.10 brew install gnu-getopt
cd /usr/local/Homebrew/Library/Taps/homebrew/homebrew-core/Formula export PATH="/usr/local/opt/gnu-getopt/bin:$PATH"
git checkout 13d52537d1e0e5f913de4639012 qt.rb
sed -i '' 's/:mysql/"mysql"/' qt.rb
sed -i '' 's/:postgresql/"postgresql"/' qt.rb
cat qt.rb
brew install qt
QTDIR="/usr/local/opt/qt" # Download Qt from Qt Installer
PATH="$QTDIR/bin:$PATH" cd ${project_dir}
mkdir build
cd build
export VERBOSE=1
export QT_CI_PACKAGES="qt.qt5.597.clang_64,qt.qt5.597.qtwebengine"
git clone https://github.com/tamlok/qtci.git
source qtci/path.env
install-qt 5.9.7
source qt-5.9.7.env
echo $PATH
QTDIR="${project_dir}/build/Qt/5.9.7/clang_64"
LDFLAGS=-L$QTDIR/lib LDFLAGS=-L$QTDIR/lib
CPPFLAGS=-I$QTDIR/include CPPFLAGS=-I$QTDIR/include
# Build your app # Build your app
cd ${project_dir} cd ${project_dir}/build
mkdir build
cd build
qmake -v qmake -v
qmake CONFIG-=debug CONFIG+=release ../VNote.pro qmake CONFIG-=debug CONFIG+=release ../VNote.pro
make -j2 make -j2