From 2716a8ecbbb202012cc7119b508a2dd9058b8088 Mon Sep 17 00:00:00 2001 From: Dydzio Date: Mon, 24 Jun 2019 19:16:07 +0200 Subject: [PATCH 1/2] Swap to VS 2017 where 2015 was used before --- CI/appveyor.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CI/appveyor.yml b/CI/appveyor.yml index 5125c759b..2b6890bea 100644 --- a/CI/appveyor.yml +++ b/CI/appveyor.yml @@ -74,9 +74,9 @@ for: - coverity_scan environment: matrix: - - NAME: Coverity - MSVS 2015 x86 - Release - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - VCMI_GENERATOR: Visual Studio 14 2015 + - NAME: Coverity - MSVS 2017 x86 - Release + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + VCMI_GENERATOR: Visual Studio 15 2017 VCMI_BUILD_PLATFORM: x86 VCMI_BUILD_CONFIGURATION: Release environment: @@ -93,9 +93,9 @@ for: - environment: matrix: - - NAME: MSVS 2015 x86 - Release - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - VCMI_GENERATOR: Visual Studio 14 2015 + - NAME: MSVS 2017 x86 - Release + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + VCMI_GENERATOR: Visual Studio 15 2017 VCMI_BUILD_PLATFORM: x86 VCMI_BUILD_CONFIGURATION: Release - NAME: MSVS 2017 x64 - Release From bb14131c5c4ec2be67d4833e057482a5dd733384 Mon Sep 17 00:00:00 2001 From: Dydzio Date: Tue, 2 Jul 2019 20:48:41 +0200 Subject: [PATCH 2/2] Use newer dependencies package --- CI/msvc/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CI/msvc/install.sh b/CI/msvc/install.sh index ce6f5db25..c912378af 100644 --- a/CI/msvc/install.sh +++ b/CI/msvc/install.sh @@ -4,7 +4,7 @@ git submodule update --init --recursive cd .. curl -LfsS -o "vcpkg-export-${VCMI_BUILD_PLATFORM}-windows-v140.7z" \ - "https://github.com/vcmi/vcmi-deps-windows/releases/download/v1/vcpkg-export-${VCMI_BUILD_PLATFORM}-windows-v140.7z" + "https://github.com/vcmi/vcmi-deps-windows/releases/download/v1.2/vcpkg-export-${VCMI_BUILD_PLATFORM}-windows-v140.7z" 7z x "vcpkg-export-${VCMI_BUILD_PLATFORM}-windows-v140.7z" cd $APPVEYOR_BUILD_FOLDER