Windows CI: use nasm on 32bit and 64bit shared builds

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

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 5a12bdb58d49891bbc4e6cab0f09483e1d7671ad..56489408b5a35a94b00e327de5c4a32e49a8719e 100644 (file)
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -5,15 +5,27 @@ 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@v2
     - uses: ilammy/msvc-dev-cmd@v1
+      with:
+        arch: ${{ matrix.arch }}
+    - uses: ilammy/setup-nasm@v1
+      with:
+        platform: ${{ matrix.arch }}
     - name: prepare the build directory
       run: mkdir _build
     - name: config
       working-directory: _build
       run: |
-        perl ..\Configure --banner=Configured no-makedepend no-fips VC-WIN64A-masm
+        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
@@ -39,24 +51,6 @@ jobs:
     - name: test
       working-directory: _build
       run: nmake test VERBOSE_FAILURE=yes TESTS=-test_fuzz
-  shared-x86:
-    runs-on: windows-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: ilammy/msvc-dev-cmd@v1
-    - name: prepare the build directory
-      run: mkdir _build
-    - name: config
-      working-directory: _build
-      run: |
-        perl ..\Configure --banner=Configured no-makedepend no-fips no-asm no-uplink VC-WIN32
-        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: