Skip to content

Commit 1eeb2c1

Browse files
authored
Switch to appveyor VS2019 image to match cutter-deps (#2184)
* Force gyp to generate vs2017 project and then upgrade it to vs2019 because version used by breakpad doesn't recognize vs2019.
1 parent cd85582 commit 1eeb2c1

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

.appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
version: '1.10.3-pre2-git-{build}'
2-
image: 'Visual Studio 2017'
2+
image: 'Visual Studio 2019'
33
clone_depth: 1
44

55
# Build configuration
@@ -9,7 +9,7 @@ configuration:
99
# Environment
1010
environment:
1111
NINJA_URL: https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja-win.zip
12-
VSVARSALLPATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat'
12+
VSVARSALLPATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat'
1313
QTPATH: 'cutter-deps\qt'
1414
USE_APPVEYOR_QT: 'false'
1515
matrix:

scripts/prepare_breakpad.bat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ DEL %CD%\build_all.vcxproj
2424
COPY %ROOT_DIR%\scripts\breakpad_client.gyp %CD%
2525

2626
CD %ROOT_DIR%\src\breakpad\src\src
27+
SET GYP_MSVS_VERSION=2017
2728
powershell -Command "tools\gyp\gyp.bat --no-circular-check client\windows\breakpad_client.gyp -Dwin_release_RuntimeLibrary=2 -Dwin_debug_RuntimeLibrary=2 -Dplatform=%ARCH% -Dconfiguration=release"
29+
devenv client\windows\breakpad_client.sln /upgrade
2830

2931
set PATH=%BUFF_PATH%
3032
msbuild /m %CD%\client\windows\breakpad_client.sln /p:Configuration=release /p:Platform=%ARCH% || exit /b 1

0 commit comments

Comments
 (0)