[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  d0196ddcba60a69930d1b1fec579949c8788be34 (commit)
      from  376a8c3f46b658027e77165ecb52021b6b27b61a (commit)


- Log -----------------------------------------------------------------
commit d0196ddcba60a69930d1b1fec579949c8788be34
Author: Dr. David von Oheimb <David.von.Oheimb at siemens.com>
Date:   Wed Jun 2 17:26:02 2021 +0200

    CI windows.yml: Silence 'nmake' builds except 'minimal'; ci.yml: make 'minimal' build verbose
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15594)

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

Summary of changes:
 .github/workflows/ci.yml      | 2 +-
 .github/workflows/windows.yml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 46a096cb75..8513cbb729 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -81,7 +81,7 @@ jobs:
     - name: config
       run: ./config --banner=Configured --strict-warnings no-bulk no-pic no-asm -DOPENSSL_NO_SECURE_MEMORY -DOPENSSL_SMALL_FOOTPRINT && perl configdata.pm --dump
     - name: make
-      run: make -s -j4
+      run: make -j4 # verbose, so no -s here
     - name: make test
       run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}
 
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 0de6e22893..bcfa45a4ba 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -29,7 +29,7 @@ jobs:
         perl configdata.pm --dump
     - name: build
       working-directory: _build
-      run: nmake
+      run: nmake /S
     - name: test
       working-directory: _build
       run: nmake test VERBOSE_FAILURE=yes TESTS=-test_fuzz* HARNESS_JOBS=4
@@ -54,7 +54,7 @@ jobs:
         perl configdata.pm --dump
     - name: build
       working-directory: _build
-      run: nmake
+      run: nmake /S
     - name: test
       working-directory: _build
       run: nmake test VERBOSE_FAILURE=yes TESTS=-test_fuzz* HARNESS_JOBS=4
@@ -72,7 +72,7 @@ jobs:
         perl configdata.pm --dump
     - name: build
       working-directory: _build
-      run: nmake
+      run: nmake # verbose, so no /S here
     - name: test
       working-directory: _build
       run: nmake test VERBOSE_FAILURE=yes TESTS=-test_fuzz* HARNESS_JOBS=4