From: Richard Levitte <levitte@openssl.org>
Date: Fri, 11 Jun 2021 01:58:49 +0000 (+0200)
Subject: Windows Github CI: test in Windows 2016 as well
X-Git-Tag: openssl-3.0.0-beta1~86
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd53c2979372c40fcfce0a1de6221f1c68b157a6;p=thirdparty%2Fopenssl.git

Windows Github CI: test in Windows 2016 as well

This brings an older version of MSVC, which may bring some "interesting"
failures.

Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15709)
---

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 5c98695a70a..ed82b398b6c 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -4,13 +4,16 @@ on: [pull_request, push]
 
 jobs:
   shared:
-    runs-on: windows-latest
     # Run a job for each of the specified target architectures:
     strategy:
       matrix:
+        os:
+          - windows-latest
+          - windows-2016
         arch:
           - win64
           - win32
+    runs-on: ${{matrix.os}}
     steps:
     - uses: actions/checkout@v2
     - uses: ilammy/msvc-dev-cmd@v1
@@ -41,7 +44,12 @@ jobs:
         nmake install DESTDIR=_dest
       working-directory: _build
   plain:
-    runs-on: windows-latest
+    strategy:
+      matrix:
+        os:
+          - windows-latest
+          - windows-2016
+    runs-on: ${{matrix.os}}
     steps:
     - uses: actions/checkout@v2
     - uses: ilammy/msvc-dev-cmd@v1
@@ -59,7 +67,12 @@ jobs:
       working-directory: _build
       run: nmake test VERBOSE_FAILURE=yes HARNESS_JOBS=4
   minimal:
-    runs-on: windows-latest
+    strategy:
+      matrix:
+        os:
+          - windows-latest
+          - windows-2016
+    runs-on: ${{matrix.os}}
     steps:
     - uses: actions/checkout@v2
     - uses: ilammy/msvc-dev-cmd@v1