From 0d5f8d6bde19be730d025e7851595c0cec36a298 Mon Sep 17 00:00:00 2001
From: Maik Riechert <maik.riechert@arcor.de>
Date: Sun, 2 May 2021 11:03:09 +0100
Subject: [PATCH] ci: bump to windows-latest image also remove misleading
 comments on MSVC

---
 .github/scripts/build-windows.ps1 | 10 +---------
 .github/workflows/ci.yml          | 10 ++++------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/.github/scripts/build-windows.ps1 b/.github/scripts/build-windows.ps1
index 66c32eb..daae2f8 100644
--- a/.github/scripts/build-windows.ps1
+++ b/.github/scripts/build-windows.ps1
@@ -22,12 +22,9 @@ function Init-VS {
     # setuptools automatically selects the right compiler for building
     # the extension module. The following is mostly for building any
     # dependencies like libraw.
-    # FIXME choose matching VC++ compiler, maybe using -vcvars_ver
-    #   -> dependencies should not be built with newer compiler than Python itself
     # https://docs.microsoft.com/en-us/cpp/build/building-on-the-command-line
     # https://docs.microsoft.com/en-us/cpp/porting/binary-compat-2015-2017
 
-    $VS2015_ROOT = "C:\Program Files (x86)\Microsoft Visual Studio 14.0"
     $VS2017_ROOT = "C:\Program Files (x86)\Microsoft Visual Studio\2017"
     $VS2019_ROOT = "C:\Program Files (x86)\Microsoft Visual Studio\2019"
 
@@ -41,12 +38,7 @@ function Init-VS {
         if ($PYTHON_VERSION_MINOR -le '4') {
             throw ("Python <= 3.4 unsupported: $env:PYTHON_VERSION")
         }
-        if (exists $VS2015_ROOT) {
-            $VS_VERSION = "2015"
-            $VS_ROOT = $VS2015_ROOT
-		    $VS_INIT_CMD = "$VS_ROOT\VC\vcvarsall.bat"
-		    $VS_INIT_ARGS = "$VS_ARCH"
-        } elseif (exists $VS2017_ROOT) {
+        if (exists $VS2017_ROOT) {
             $VS_VERSION = "2017"
             if (exists "$VS2017_ROOT\Enterprise") {
                 $VS_ROOT = "$VS2017_ROOT\Enterprise"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 44b4bfc..712bb38 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -56,24 +56,22 @@ jobs:
           python-version: '3.9'
           numpy-version: '1.19.*'
 
-        # Use 2016 image as 2019 does not have VC++ 14.0 compiler.
-        # https://github.community/t5/GitHub-Actions/Microsoft-Visual-C-14-0-compiler-not-available-on-Windows-2019/m-p/32871 
-        - os-image: windows-2016
+        - os-image: windows-latest
           os-name: windows
           python-version: '3.6'
           python-arch: '64'
           numpy-version: '1.11'
-        - os-image: windows-2016
+        - os-image: windows-latest
           os-name: windows
           python-version: '3.7'
           python-arch: '64'
           numpy-version: '1.14'
-        - os-image: windows-2016
+        - os-image: windows-latest
           os-name: windows
           python-version: '3.8'
           python-arch: '64'
           numpy-version: '1.17'
-        - os-image: windows-2016
+        - os-image: windows-latest
           os-name: windows
           python-version: '3.9'
           python-arch: '64'