ci: Clean up AppVeyor config file

- Get rid of TOP_DIR - it wasn't set to anything
- Remove unmeeded submodule update
- Build 2 jobs instead of 4
- Use -A CMake argument instead of creating a generator string
  based on the worker image and architecture.  Instead, set the
  architecture (platform Win32 or x64) with -A and take whatever
  Visual Studio version is provided by the worker image.  The
  worker image is specified by the "os" config property.

diff --git a/.appveyor.yml b/.appveyor.yml
index e33b15ff025f59a3187e20a8f764ba87c07e76ff..8c0a1d50f851c97e824bc6517af8404ca2bb7fd5 100644 (file)
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -26,13 +26,6 @@ before_build:
   - "SET PATH=C:\\Python35;C:\\Python35\\Scripts;%PATH%"
   - echo.
   - echo Starting build for %APPVEYOR_REPO_NAME%
-  - git submodule update --init --recursive
-  # Determine the appropriate CMake generator for the current version of Visual Studio
-  - if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2013" (set VS_VERSION=12 2013)
-  - if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2015" (set VS_VERSION=14 2015)
-  - if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2017" (set VK_VERSION=15 2017)
-  - if %PLATFORM% == Win32 (set GENERATOR="Visual Studio %VS_VERSION%")
-  - if %PLATFORM% == x64 (set GENERATOR="Visual Studio %VS_VERSION% Win64")
   # Install Vulkan-Headers
   - mkdir %TEMP%\headers
   - git clone https://github.com/KhronosGroup/Vulkan-Headers.git %TEMP%\headers\repo
@@ -45,11 +38,10 @@ before_build:
   # Get Google Test
   - git clone https://github.com/google/googletest.git external/googletest
   # Generate build files using CMake for the build step.
-  - echo Generating CMake files for %GENERATOR%
-  - cd %TOP_DIR%
+  - echo Generating CMake files for %PLATFORM%
   - mkdir build
   - cd build
-  - cmake -G %GENERATOR% -DVULKAN_HEADERS_INSTALL_DIR=%TEMP%\headers\install ..
+  - cmake -A %PLATFORM% -DVULKAN_HEADERS_INSTALL_DIR=%TEMP%\headers\install ..
   - echo Building platform=%PLATFORM% configuration=%CONFIGURATION%
 
 platform:
@@ -60,6 +52,16 @@ configuration:
   - Release
   - Debug
 
+# Build only x64 Release and Win32(x86) Debug to reduce build time.
+# This should still provide adequate 32-bit vs 64-bit and
+# Release vs Debug coverage.
+matrix:
+  exclude:
+    - configuration: Release
+      platform: Win32
+    - configuration: Debug
+      platform: x64
+
 build:
   parallel: true                   # enable MSBuild parallel builds
   project: build/Vulkan-Loader.sln # path to Visual Studio solution or project