[openssl] master update

[tomas at openssl.org]

The branch master has been updated
       via  69d8cf70ef6496e0bc8fc5a27b068b4b4488d4a8 (commit)
       via  d7c18395bfc17d00e490472cbc3fd40dff0d02b7 (commit)
      from  094287551a31ba74eb9bfdb4a808d19f4553371b (commit)


- Log -----------------------------------------------------------------
commit 69d8cf70ef6496e0bc8fc5a27b068b4b4488d4a8
Author: Tomas Mraz <tomas at openssl.org>
Date:   Fri May 21 10:56:00 2021 +0200

    Windows CI: use nasm on 32bit and 64bit shared builds
    
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15349)

commit d7c18395bfc17d00e490472cbc3fd40dff0d02b7
Author: Tomas Mraz <tomas at openssl.org>
Date:   Wed May 19 14:18:04 2021 +0200

    Add some basic Windows builds to the Windows CI workflow
    
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15349)

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

Summary of changes:
 .github/workflows/windows.yml | 48 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 57962eef55..56489408b5 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -3,6 +3,54 @@ name: Windows GitHub CI
 on: [pull_request, push]
 
 jobs:
+  shared:
+    runs-on: windows-latest
+    # Run a job for each of the specified target architectures:
+    strategy:
+      matrix:
+        arch:
+          - win64
+          - win32
+    steps:
+    - uses: actions/checkout at v2
+    - uses: ilammy/msvc-dev-cmd at v1
+      with:
+        arch: ${{ matrix.arch }}
+    - uses: ilammy/setup-nasm at v1
+      with:
+        platform: ${{ matrix.arch }}
+    - name: prepare the build directory
+      run: mkdir _build
+    - name: config
+      working-directory: _build
+      run: |
+        if ( "${{ matrix.arch }}" -eq "win32" ) { $target = "VC-WIN32" } else { $target = "VC-WIN64A" }
+        perl ..\Configure --banner=Configured no-makedepend no-fips $target
+        perl configdata.pm --dump
+    - name: build
+      working-directory: _build
+      run: nmake
+    - name: test
+      working-directory: _build
+      run: nmake test VERBOSE_FAILURE=yes TESTS=-test_fuzz
+  plain:
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout at v2
+    - uses: ilammy/msvc-dev-cmd at v1
+    - name: prepare the build directory
+      run: mkdir _build
+    - name: config
+      working-directory: _build
+      run: |
+        perl ..\Configure --banner=Configured no-makedepend no-shared no-fips VC-WIN64A-masm
+        perl configdata.pm --dump
+    - name: build
+      working-directory: _build
+      run: nmake
+    - name: test
+      working-directory: _build
+      run: nmake test VERBOSE_FAILURE=yes TESTS=-test_fuzz
   minimal:
     runs-on: windows-latest
     steps: