CI: Replace windows-2016 with windows-2022

Windows 2016 environment is going to be discontinued.

Fixes #17177

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

diff --git a/.github/workflows/os-zoo.yml b/.github/workflows/os-zoo.yml
index 659dd61ea8468177aeb3a59719bd98e344c3148c..3e05b803d861c3c9f750be1ce172cdd5bd8994e8 100644 (file)
--- a/.github/workflows/os-zoo.yml
+++ b/.github/workflows/os-zoo.yml
@@ -40,15 +40,15 @@ jobs:
       fail-fast: false
       matrix:
         os: [
-          windows-2016,
           windows-2019,
-          #windows-2022,    # Perl issues, doesn't finish configure step
+          windows-2022
         ]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v2
     - uses: ilammy/msvc-dev-cmd@v1
     - uses: ilammy/setup-nasm@v1
+    - uses: shogo82148/actions-setup-perl@v1
     - name: prepare the build directory
       run: mkdir _build
     - name: config

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index cb9e84b33ddd3af796459d8d799fda432eb7b3e3..553e0c36500840bd0634c7ccd5e0da70f520ac06 100644 (file)
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -16,7 +16,7 @@ jobs:
       matrix:
         os:
           - windows-latest
-          - windows-2016
+          - windows-2022
         platform:
           - arch: win64
             config: VC-WIN64A enable-fips
@@ -31,6 +31,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
@@ -56,11 +57,12 @@ jobs:
       matrix:
         os:
           - windows-latest
-          - windows-2016
+          - 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
@@ -79,11 +81,12 @@ jobs:
       matrix:
         os:
           - windows-latest
-          - windows-2016
+          - 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