dawy_go/vnote
1
0
Fork 0
mirror of https://gitee.com/vnotex/vnote.git synced 2025-07-05 13:59:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "XCode 10.1 and Qt 5.12.1 on macOS CI"

Browse Source 
This reverts commit 7beebd8c0ad1fb2cd4c3f872b2df0d1523301445.
This commit is contained in:
Le Tan 2019-03-21 09:12:14 +08:00
parent 4890749b5d
commit 03e9982980
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

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

8
.travis_macos.sh
View File

@ -19,17 +19,17 @@ mkdir build
cd build cd build
export VERBOSE=1 export VERBOSE=1
export QT_CI_PACKAGES="qt.qt5.5121.clang_64,qt.qt5.5121.qtwebengine" export QT_CI_PACKAGES="qt.qt5.597.clang_64,qt.qt5.597.qtwebengine"
git clone https://github.com/tamlok/qtci.git git clone https://github.com/tamlok/qtci.git
source qtci/path.env source qtci/path.env
install-qt 5.12.1 install-qt 5.9.7
source qt-5.12.1.env source qt-5.9.7.env
echo $PATH echo $PATH
QTDIR="${project_dir}/build/Qt/5.12.1/clang_64" 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