Archived
AppVeyor: update to use more recent Qt and MSVC
The last version of Qt to support MSVC 2015 is no longer maintained, so I'm skipping that. I'm therefore rededicating MSVC 2017 for 32-bit. There's also no more no-tests build.
This commit is contained in:
+6
-13
@@ -2,18 +2,13 @@ version: 0.6-build-{build}
|
||||
pull_requests:
|
||||
do_not_increment_build_number: true
|
||||
image:
|
||||
- Visual Studio 2015
|
||||
- Visual Studio 2013
|
||||
- Visual Studio 2017
|
||||
- Visual Studio 2019
|
||||
install:
|
||||
- cmd: >-
|
||||
set tests=1
|
||||
if /i "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" (call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x86) & (set QTDIR=C:\Qt\5.13\msvc2017)
|
||||
|
||||
if /i "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2013" (call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" amd64) & (set tests=0)
|
||||
|
||||
if /i "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" (call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86) & (set QTDIR=C:\Qt\5.9\msvc2015)
|
||||
|
||||
if /i "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" (call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64) & (set QTDIR=C:\Qt\5.9\msvc2017_64)
|
||||
if /i "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2019" (call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x64) & (set QTDIR=C:\Qt\6.1\msvc2019_64)
|
||||
|
||||
set path=%PATH%;%QTDIR%\bin
|
||||
build_script:
|
||||
@@ -22,14 +17,12 @@ build_script:
|
||||
|
||||
cd tests
|
||||
|
||||
if /i "%tests%"=="1" qmake CONFIG-=release CONFIG+=debug
|
||||
qmake CONFIG-=release CONFIG+=debug
|
||||
|
||||
if /i "%tests%"=="1" nmake -nologo -s
|
||||
nmake -nologo -s
|
||||
test_script:
|
||||
- cmd: >-
|
||||
if /i "%tests%"=="1" nmake -s -nologo TESTARGS=-silent check
|
||||
|
||||
if /i "%tests%"=="0" echo Tests skipped.
|
||||
nmake -s -nologo TESTARGS=-silent check
|
||||
artifacts:
|
||||
- path: lib\tinycbor.lib
|
||||
deploy: off
|
||||
|
||||
Reference in New Issue
Block a user