From ab1c94aa55fb6f1a3797168d3b6ef20a27207c79 Mon Sep 17 00:00:00 2001
From: "Pavel I. Kryukov" <kryukov@frtk.ru>
Date: Sun, 12 Apr 2020 00:46:27 +0300
Subject: [PATCH] Clean up .appveyor.yml (#1288)

---
 .appveyor.yml | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 2170efd20..a3de3eb0e 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -16,32 +16,27 @@ environment:
     configuration: Release
     CMAKEFILE: "Visual Studio 15 Win64"
   - build: msvc
-    platform: x86
+    platform: Win32
     configuration: Release
     CMAKEFILE: "Visual Studio 15"
   - build: g++
-    platform: x86
+    MSYSTEM: mingw64
     configuration: Release
     CMAKEFILE: "Ninja"
   - build: g++
-    platform: x64
+    MSYSTEM: mingw32
     configuration: Release
     CMAKEFILE: "Ninja"
 
 install:
 - if "%configuration%"=="Debug" choco install opencppcoverage codecov
-- if "%platform%"=="x86" set MSYSTEM=mingw32
-- if "%platform%"=="x64" set MSYSTEM=mingw64
 - set PATH=C:\projects\deps\ninja;C:\msys64\%MSYSTEM%;C:\msys64\%MSYSTEM%\bin;C:\msys64\usr\bin\;C:\Libraries\boost_1_67_0;C:\Program Files\OpenCppCoverage;%PATH%
 
 before_build:
 - git submodule update --init
-- call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat" -arch=%platform%
-- if "%platform%"=="x86" set platform=Win32 # oh dear
 
 build_script:
-- mkdir build
-- cd build
+- mkdir build && cd build
 - cmake ../simulator -G "%CMAKEFILE%" -DENABLE_COVERAGE=1
 - if not "%build%"=="msvc" bash -lc "cd /c/projects/mipt-mips/build; ninja mipt-mips unit-tests cachesim"
 - if "%build%"=="msvc" MSBuild .\mipt-mips.sln /p:Configuration=%configuration% /p:Platform=%platform% /nologo /m /verbosity:minimal