Update windows CI to 2019

This commit is contained in:
Florian Märkl 2022-03-30 10:57:10 +02:00 committed by Anton Kochkov
parent 1ed19e7fc4
commit 5e8aa4f993

View File

@ -19,13 +19,13 @@ jobs:
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
strategy: strategy:
matrix: matrix:
os: [ubuntu-20.04, ubuntu-18.04, macos-latest, windows-2016] os: [ubuntu-20.04, ubuntu-18.04, macos-latest, windows-2019]
python-version: [3.7.x] python-version: [3.7.x]
system-deps: [false] system-deps: [false]
cc-override: [default] cc-override: [default]
cxx-override: [default] cxx-override: [default]
include: include:
- os: windows-2016 - os: windows-2019
package: true package: true
- os: ubuntu-18.04 # ensure that Cutter can be built at least in basic config on Ubuntu 18.04 using sytem libraries - os: ubuntu-18.04 # ensure that Cutter can be built at least in basic config on Ubuntu 18.04 using sytem libraries
python-version: 3.6.x python-version: 3.6.x
@ -213,7 +213,7 @@ jobs:
set ARCH=x64 set ARCH=x64
set CUTTER_DEPS=%CD%\cutter-deps set CUTTER_DEPS=%CD%\cutter-deps
set PATH=%CD%\cutter-deps\qt\bin;%PATH% set PATH=%CD%\cutter-deps\qt\bin;%PATH%
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
call scripts\prepare_breakpad.bat call scripts\prepare_breakpad.bat
cd cd
mkdir build mkdir build