From 44dc8bbb1330a07a7cd3c1b379d6e15dc8258010 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Tue, 15 Aug 2017 11:06:51 +0200
Subject: [PATCH] ci/win: list build permutations explicitly (#7163)

This avoids changing the matrix permutations for the old non-gcov
builds, so that old URLs continue to work:

https://ci.appveyor.com/api/projects/neovim/neovim/artifacts/build/Neovim.zip?branch=master&job=Configuration%3A%20MINGW_32
https://ci.appveyor.com/api/projects/neovim/neovim/artifacts/build/Neovim.zip?branch=master&job=Configuration%3A%20MINGW_64
---
 appveyor.yml | 9 +--------
 ci/build.bat | 8 ++++++--
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index acf21ced9d..f016a12e1d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -2,14 +2,7 @@ version: '{build}'
 configuration:
 - MINGW_64
 - MINGW_32
-environment:
-  matrix:
-    - USE_GCOV: ON
-    - USE_GCOV: OFF
-matrix:
-  exclude:
-    - configuration: MINGW_32
-      USE_GCOV: ON
+- MINGW_64-gcov
 install: []
 build_script:
 - call ci\build.bat
diff --git a/ci/build.bat b/ci/build.bat
index 9c6b77c49a..6eb22176a9 100644
--- a/ci/build.bat
+++ b/ci/build.bat
@@ -9,6 +9,10 @@ if "%CONFIGURATION%" == "MINGW_32" (
   set ARCH=x86_64
   set BITS=64
 )
+if "%CONFIGURATION%" == "MINGW_64-gcov" (
+  set USE_GCOV="-DUSE_GCOV=ON"
+)
+
 :: We cannot have sh.exe in the PATH (MinGW)
 set PATH=%PATH:C:\Program Files\Git\usr\bin;=%
 set PATH=C:\msys64\mingw%BITS%\bin;C:\Windows\System32;C:\Windows;%PATH%
@@ -38,14 +42,14 @@ cd ..
 :: Build Neovim
 mkdir build
 cd build
-cmake -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUSTED_OUTPUT_TYPE=nvim -DUSE_GCOV="%USE_GCOV%" -DGPERF_PRG="C:\msys64\usr\bin\gperf.exe" .. || goto :error
+cmake -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUSTED_OUTPUT_TYPE=nvim %USE_GCOV% -DGPERF_PRG="C:\msys64\usr\bin\gperf.exe" .. || goto :error
 mingw32-make VERBOSE=1 || goto :error
 bin\nvim --version || goto :error
 
 :: Functional tests
 mingw32-make functionaltest VERBOSE=1 || goto :error
 
-if "%USE_GCOV%" == "ON" (
+if defined USE_GCOV (
   C:\msys64\usr\bin\bash -lc "cd /c/projects/neovim; bash <(curl -s https://codecov.io/bash) || echo 'codecov upload failed.'"
 )