From: Tomas Mraz <tomas@openssl.org>
Date: Mon, 6 Dec 2021 11:38:48 +0000 (+0100)
Subject: CI: Replace windows-2016 with windows-2022
X-Git-Tag: OpenSSL_1_1_1m~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f560b4cda1d3d8f8d7f5355a1f797699241a3ae8;p=thirdparty%2Fopenssl.git

CI: Replace windows-2016 with windows-2022

Windows 2016 environment is going to be discontinued.

We also replace windows-latest with windows-2019 so
there aren't two identical builds done once windows-latest
is switched to mean windows-2022.

Fixes #17177

Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17211)
---

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index c11242a56f6..6f1b50552ee 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -9,8 +9,8 @@ jobs:
     strategy:
       matrix:
         os:
-        - windows-latest
-        - windows-2016
+        - windows-2019
+        - windows-2022
         platform:
         - arch: win64
           config: VC-WIN64A
@@ -25,6 +25,7 @@ jobs:
     - uses: ilammy/setup-nasm@v1
       with:
         platform: ${{ matrix.platform.arch }}
+    - uses: shogo82148/actions-setup-perl@v1
     - name: prepare the build directory
       run: mkdir _build
     - name: config
@@ -49,12 +50,13 @@ jobs:
     strategy:
       matrix:
         os:
-        - windows-latest
-        - windows-2016
+        - windows-2019
+        - windows-2022
     runs-on: ${{matrix.os}}
     steps:
     - uses: actions/checkout@v2
     - uses: ilammy/msvc-dev-cmd@v1
+    - uses: shogo82148/actions-setup-perl@v1
     - name: prepare the build directory
       run: mkdir _build
     - name: config
@@ -72,12 +74,13 @@ jobs:
     strategy:
       matrix:
         os:
-        - windows-latest
-        - windows-2016
+        - windows-2019
+        - windows-2022
     runs-on: ${{matrix.os}}
     steps:
     - uses: actions/checkout@v2
     - uses: ilammy/msvc-dev-cmd@v1
+    - uses: shogo82148/actions-setup-perl@v1
     - name: prepare the build directory
       run: mkdir _build
     - name: config