[openssl] master update

[tomas at openssl.org]

The branch master has been updated
       via  c87a4dd7a728288da943cb4e2e51150df5dfd1b8 (commit)
      from  38288f424faa0cf61bd705c497bb1a1657611da1 (commit)


- Log -----------------------------------------------------------------
commit c87a4dd7a728288da943cb4e2e51150df5dfd1b8
Author: Tomas Mraz <tomas at openssl.org>
Date:   Fri Dec 3 11:59:07 2021 +0100

    CI: Replace windows-2016 with windows-2022
    
    Windows 2016 environment is going to be discontinued.
    
    Fixes #17177
    
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/17183)

-----------------------------------------------------------------------

Summary of changes:
 .github/workflows/os-zoo.yml  | 4 ++--
 .github/workflows/windows.yml | 9 ++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/os-zoo.yml b/.github/workflows/os-zoo.yml
index 659dd61ea8..3e05b803d8 100644
--- 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 at v2
     - uses: ilammy/msvc-dev-cmd at v1
     - uses: ilammy/setup-nasm at v1
+    - uses: shogo82148/actions-setup-perl at v1
     - name: prepare the build directory
       run: mkdir _build
     - name: config
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index cb9e84b33d..553e0c3650 100644
--- 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 at v1
       with:
         platform: ${{ matrix.platform.arch }}
+    - uses: shogo82148/actions-setup-perl at 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 at v2
     - uses: ilammy/msvc-dev-cmd at v1
+    - uses: shogo82148/actions-setup-perl at 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 at v2
     - uses: ilammy/msvc-dev-cmd at v1
+    - uses: shogo82148/actions-setup-perl at v1
     - name: prepare the build directory
       run: mkdir _build
     - name: config