AppVeyor: switch to VS2017, Qt 5.12 and disable x86 build (#1184)

This commit is contained in:
Paul I 2019-02-14 21:42:52 +03:00 committed by xarkes
parent fe49aa8e13
commit e832f57bbd

View File

@ -1,5 +1,5 @@
version: '1.7.4-git-{build}' version: '1.7.4-git-{build}'
image: 'Visual Studio 2015' image: 'Visual Studio 2017'
clone_depth: 1 clone_depth: 1
# Build configuration # Build configuration
@ -9,16 +9,16 @@ configuration:
# Environment # Environment
environment: environment:
NINJA_URL: https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-win.zip NINJA_URL: https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-win.zip
QT32PATH: 'C:\Qt\5.10.1\msvc2015' QT32PATH: 'C:\Qt\5.12\msvc2017'
QT64PATH: 'C:\Qt\5.10.1\msvc2015_64' QT64PATH: 'C:\Qt\5.12\msvc2017_64'
VSVARSALLPATH: 'C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat' VSVARSALLPATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat'
matrix: matrix:
# Build: qmake vs2015 x86 shared # Build: qmake vs2017 x86 shared
- ARCH: x86 #- ARCH: x86
PYTHON: 'C:\Python36' # PYTHON: 'C:\Python36'
QMAKE: 1 # QMAKE: 1
DEPLOY: true # DEPLOY: true
# Build: qmake vs2015 x64 shared # Build: qmake vs2017 x64 shared
- ARCH: x64 - ARCH: x64
PYTHON: 'C:\Python36-x64' PYTHON: 'C:\Python36-x64'
QMAKE: 1 QMAKE: 1
@ -31,10 +31,11 @@ environment:
DEPLOY: false DEPLOY: false
install: install:
- ps: $env:path = ($env:path -split ";").Where({!($_ -like "*Microsoft SQL Server*")}) -join ";"
- cmd: set "PATH=%CD%;%PYTHON%;%PATH%" - cmd: set "PATH=%CD%;%PYTHON%;%PATH%"
- cmd: call "%VSVARSALLPATH%" %ARCH% - cmd: call "%VSVARSALLPATH%" %ARCH%
- cmd: if "%ARCH%" == "x64" ( set "PATH=%QT64PATH%\bin;%PATH%" ) else ( set "PATH=%QT32PATH%\bin;%PATH%" ) - cmd: if "%ARCH%" == "x64" ( set "PATH=%QT64PATH%\bin;%PATH%" ) else ( set "PATH=%QT32PATH%\bin;%PATH%" )
- cmd: python -m pip install meson==0.48.2 - cmd: python -m pip install meson
- cmd: powershell -Command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; wget %NINJA_URL% -OutFile ninja.zip; Expand-Archive .\ninja.zip -DestinationPath ." - cmd: powershell -Command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; wget %NINJA_URL% -OutFile ninja.zip; Expand-Archive .\ninja.zip -DestinationPath ."
# Artifacts # Artifacts
- cmd: set "ARTIFACT_NAME=Cutter-v1.7.4-%ARCH%.Windows" - cmd: set "ARTIFACT_NAME=Cutter-v1.7.4-%ARCH%.Windows"
@ -47,7 +48,7 @@ before_build:
# Build config # Build config
build_script: build_script:
- cmd: if defined QMAKE ( call prepare_r2.bat && call build.bat CUTTER_APPVEYOR_R2DEC=true ) - cmd: if defined QMAKE ( call prepare_r2.bat && call build.bat CUTTER_APPVEYOR_R2DEC=true )
- cmd: if defined MESON ( python meson.py --release --dist=%ARTIFACT_PATH% --backend=%BACKEND% --jupyter --webengine ) - cmd: if defined MESON ( python meson.py --release --dist=%ARTIFACT_PATH% --backend=%BACKEND% --jupyter )
after_build: after_build:
- cmd: if defined QMAKE ( set "PATH=%CD%\r2_dist_%ARCH%;%PATH%" && powershell scripts\bundle_r2dec.ps1 "%CD%\%ARTIFACT_PATH%" ) - cmd: if defined QMAKE ( set "PATH=%CD%\r2_dist_%ARCH%;%PATH%" && powershell scripts\bundle_r2dec.ps1 "%CD%\%ARTIFACT_PATH%" )