From: Tomas Mraz <tomas@openssl.org>
Date: Wed, 4 Sep 2024 09:34:12 +0000 (+0200)
Subject: Reduce footprint of Windows CI
X-Git-Tag: openssl-3.3.3~189
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f676b28d3dee92b4aeda68f93c18c1fe00401f0;p=thirdparty%2Fopenssl.git

Reduce footprint of Windows CI

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Hugo Landau <hlandau@devever.net>
(Merged from https://github.com/openssl/openssl/pull/25378)

(cherry picked from commit a4954ea01a5665df2963d0e8e7d86997793c37c6)
---

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 8c0382502d6..0c6dbf8ead0 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -17,17 +17,17 @@ jobs:
     # Run a job for each of the specified target architectures:
     strategy:
       matrix:
-        os:
-          - windows-2019
-          - windows-2022
         platform:
           - arch: win64
+            os: windows-2019
             config: enable-fips
           - arch: win64
+            os: windows-2022
             config: enable-fips no-thread-pool no-quic
           - arch: win32
+            os: windows-2022
             config: --strict-warnings no-fips
-    runs-on: ${{ github.server_url == 'https://github.com' && matrix.os || format('{0}-self-hosted', matrix.os) }}
+    runs-on: ${{ github.server_url == 'https://github.com' && matrix.platform.os || format('{0}-self-hosted', matrix.platform.os) }}
     steps:
     - uses: actions/checkout@v4
     - name: checkout fuzz/corpora submodule
@@ -77,7 +77,7 @@ jobs:
     strategy:
       matrix:
         os:
-          - windows-2019
+# Reducing CI footprint  - windows-2019
           - windows-2022
     runs-on: ${{ github.server_url == 'https://github.com' && matrix.os || format('{0}-self-hosted', matrix.os) }}
     steps:
@@ -115,7 +115,7 @@ jobs:
       matrix:
         os:
           - windows-2019
-          - windows-2022
+# Reducing CI footprint  - windows-2022
     runs-on: ${{ github.server_url == 'https://github.com' && matrix.os || format('{0}-self-hosted', matrix.os) }}
     steps:
     - uses: actions/checkout@v4