diff --git a/.travis.yml b/.travis.yml index c963cb0b..b5a0818f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ matrix: include: - os: osx compiler: clang - osx_image: xcode8 + osx_image: xcode9.4 - os: linux compiler: g++ diff --git a/.travis_macos.sh b/.travis_macos.sh index 5ba4b65e..e24c3b3e 100644 --- a/.travis_macos.sh +++ b/.travis_macos.sh @@ -10,23 +10,31 @@ fi brew update > /dev/null -# Use Qt5.9.3 instead of 5.10 -cd /usr/local/Homebrew/Library/Taps/homebrew/homebrew-core/Formula -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 +brew install gnu-getopt +export PATH="/usr/local/opt/gnu-getopt/bin:$PATH" -QTDIR="/usr/local/opt/qt" -PATH="$QTDIR/bin:$PATH" +# Download Qt from Qt Installer +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 CPPFLAGS=-I$QTDIR/include # Build your app -cd ${project_dir} -mkdir build -cd build +cd ${project_dir}/build qmake -v qmake CONFIG-=debug CONFIG+=release ../VNote.pro make -j2