From: Tomas Mraz <tomas@openssl.org>
Date: Mon, 31 May 2021 12:22:35 +0000 (+0200)
Subject: Windows CI: enable fips on shared 64 bit build
X-Git-Tag: openssl-3.0.0-beta1~275
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=86825c99172f46da40867292a0eeebb2ef289c02;p=thirdparty%2Fopenssl.git

Windows CI: enable fips on shared 64 bit build

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

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 0d0b5948080..0de6e228937 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -24,15 +24,15 @@ jobs:
     - 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
+        if ( "${{ matrix.arch }}" -eq "win32" ) { $target = "VC-WIN32" ; $fips = "no-fips" } else { $target = "VC-WIN64A" ; $fips = "enable-fips" }
+        perl ..\Configure --banner=Configured no-makedepend $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*
+      run: nmake test VERBOSE_FAILURE=yes TESTS=-test_fuzz* HARNESS_JOBS=4
     - name: install
       # Run on 64 bit only as 32 bit is slow enough already
       if: $${{ matrix.arch == 'win64' }}
@@ -57,7 +57,7 @@ jobs:
       run: nmake
     - name: test
       working-directory: _build
-      run: nmake test VERBOSE_FAILURE=yes TESTS=-test_fuzz*
+      run: nmake test VERBOSE_FAILURE=yes TESTS=-test_fuzz* HARNESS_JOBS=4
   minimal:
     runs-on: windows-latest
     steps:
@@ -75,4 +75,4 @@ jobs:
       run: nmake
     - name: test
       working-directory: _build
-      run: nmake test VERBOSE_FAILURE=yes TESTS=-test_fuzz*
+      run: nmake test VERBOSE_FAILURE=yes TESTS=-test_fuzz* HARNESS_JOBS=4