package/ci: drop MSVC 2015, introduce MSVC 2019.

mosra · Aug 4, 2019 · 0b384ce · 0b384ce
1 parent b14b9e1
commit 0b384ce
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 21 deletions.
diff --git a/package/ci/appveyor-desktop.bat b/package/ci/appveyor-desktop.bat
@@ -1,5 +1,5 @@
 if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2017" call "C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Auxiliary/Build/vcvarsall.bat" x64 || exit /b
-if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2015" call "C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/vcvarsall.bat" x64 || exit /b
+if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2019" call "C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Auxiliary/Build/vcvarsall.bat" x64 || exit /b
 set PATH=%APPVEYOR_BUILD_FOLDER%\deps\bin;%PATH%
 
 rem Build Corrade

diff --git a/package/ci/appveyor.yml b/package/ci/appveyor.yml
@@ -4,11 +4,6 @@ clone_depth: 1
 
 environment:
   matrix:
-  - BRANCH: base
-    COMPILER: msvc
-    EXTRA: -DWITH_SDL2APPLICATION=ON
-    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-    APPVEYOR_JOB_NAME: base-windows-msvc2015
   - BRANCH: base
     COMPILER: msvc
     EXTRA: -DWITH_SDL2APPLICATION=ON
@@ -19,46 +14,51 @@ environment:
     EXTRA: -DWITH_SDL2APPLICATION=ON
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
     APPVEYOR_JOB_NAME: base-windows-mingw
-  - BRANCH: base-glfw
+  - BRANCH: base
     COMPILER: msvc
-    EXTRA: -DWITH_GLFWAPPLICATION=ON
-    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-    APPVEYOR_JOB_NAME: base-glfw-windows-msvc2015
+    EXTRA: -DWITH_SDL2APPLICATION=ON
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+    APPVEYOR_JOB_NAME: base-windows-msvc2019
   - BRANCH: base-glfw
     COMPILER: msvc
     EXTRA: -DWITH_GLFWAPPLICATION=ON
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
     APPVEYOR_JOB_NAME: base-glfw-windows-msvc2017
-  - BRANCH: windowless
+  - BRANCH: base-glfw
     COMPILER: msvc
-    EXTRA: -DWITH_WINDOWLESSWGLAPPLICATION=ON
-    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-    APPVEYOR_JOB_NAME: windowless-windows-msvc2015
+    EXTRA: -DWITH_GLFWAPPLICATION=ON
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+    APPVEYOR_JOB_NAME: base-glfw-windows-msvc2019
   - BRANCH: windowless
     COMPILER: msvc
     EXTRA: -DWITH_WINDOWLESSWGLAPPLICATION=ON
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
     APPVEYOR_JOB_NAME: windowless-windows-msvc2017
-  - BRANCH: scenegraph2D
+  - BRANCH: windowless
     COMPILER: msvc
-    EXTRA: -DWITH_SDL2APPLICATION=ON -DWITH_SCENEGRAPH=ON
-    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-    APPVEYOR_JOB_NAME: scenegraph2D-windows-msvc2015
+    EXTRA: -DWITH_WINDOWLESSWGLAPPLICATION=ON
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+    APPVEYOR_JOB_NAME: windowless-windows-msvc2019
   - BRANCH: scenegraph2D
     COMPILER: msvc
     EXTRA: -DWITH_SDL2APPLICATION=ON -DWITH_SCENEGRAPH=ON
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
     APPVEYOR_JOB_NAME: scenegraph2D-windows-msvc2017
-  - BRANCH: scenegraph3D
+  - BRANCH: scenegraph2D
     COMPILER: msvc
     EXTRA: -DWITH_SDL2APPLICATION=ON -DWITH_SCENEGRAPH=ON
-    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-    APPVEYOR_JOB_NAME: scenegraph3D-windows-msvc2015
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+    APPVEYOR_JOB_NAME: scenegraph2D-windows-msvc2019
   - BRANCH: scenegraph3D
     COMPILER: msvc
     EXTRA: -DWITH_SDL2APPLICATION=ON -DWITH_SCENEGRAPH=ON
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
     APPVEYOR_JOB_NAME: scenegraph3D-windows-msvc2017
+  - BRANCH: scenegraph3D
+    COMPILER: msvc
+    EXTRA: -DWITH_SDL2APPLICATION=ON -DWITH_SCENEGRAPH=ON
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+    APPVEYOR_JOB_NAME: scenegraph3D-windows-msvc2019
   # Disabled for now because I don't want to be bothered with signing and
   # certificates and shit
   #- BRANCH: base-winrt