Browse Source

Merge pull request #608 from vcmi/BreakVS2015Compatibility

Break Visual Studio 2015 support
Alexander Shishkin 6 năm trước cách đây
mục cha
commit
f599187563
2 tập tin đã thay đổi với 7 bổ sung7 xóa
  1. 6 6
      CI/appveyor.yml
  2. 1 1
      CI/msvc/install.sh

+ 6 - 6
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

+ 1 - 1
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