ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'alistair/appveyor-qt-update' into 'master'

Browse Source 
appveyor.yml: Update to Qt 5.15 and VS 2019

Closes #208

See merge request spectral-im/spectral!78
This commit is contained in:
Black Hat
2020-07-16 00:35:37 +00:00
parent 2458769f10 e2841e5430
commit c8b75202c0
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.appveyor.yml
View File

@@ -1,10 +1,10 @@
image: Visual Studio 2017
image: Visual Studio 2019
environment:
DEPLOY_DIR: Spectral-%APPVEYOR_BUILD_VERSION%
matrix:
- QTDIR: C:\Qt\5.12\msvc2017_64
VCVARS: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Auxiliary\\Build\\vcvars64.bat"
- QTDIR: C:\Qt\5.15\msvc2019_64
VCVARS: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community\\VC\\Auxiliary\\Build\\vcvars64.bat"
PLATFORM:
init:

2
.gitlab-ci.yml
View File

@@ -19,7 +19,7 @@ build-appimage:
- sudo cmake --build build --target install
- cd ..
- git clone https://github.com/commonmark/cmark.git && cd cmark
- git checkout tags/0.29.0
- git reset --hard tags/0.29.0
- cmake . -Bbuild -LA -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=install -DCMARK_SHARED=ON -DCMARK_STATIC=ON -DCMARK_TESTS=OFF
- cmake --build build --target install --parallel $(nproc)
- cd ..