[ros-diffs] [reactos] 02/02: [GITHUB] Fix MSVC 2015 (v14.0) build, until a clear consensus is reached for PR #3872 (#4454) CORE-18146

[Hermès Bélusca-Maïto]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0d08c6429d04e1c158030…

commit 0d08c6429d04e1c158030e1ff84ff56a56887bbb
Author:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
AuthorDate: Sun Apr 17 02:26:13 2022 +0200
Commit:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
CommitDate: Sat Apr 23 19:14:06 2022 +0200

    [GITHUB] Fix MSVC 2015 (v14.0) build, until a clear consensus is reached for PR #3872
(#4454)
    CORE-18146
    
    Use the matrix.os + include/exclude technique, as suggested
    by Serge Gautherie :)
---
 .github/workflows/build.yml | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3d8acbae356..b45b9b1d87b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -78,14 +78,19 @@ jobs:
   build-msvc:
     strategy:
       matrix:
-        toolset: ['14.2', '14.1'] # VS 2019, 2017
+        os: [windows-latest, windows-2019]
+        toolset: ['14.2', '14.1', '14.0'] # VS 2019, 2017, and
2015 (see below)
         arch: [i386, amd64]
         config: [Debug, Release]
-        include:
-        - arch: i386 # Not compiling on amd64 prompt
-          toolset: '14.0' # VS 2015
+        exclude: # VS 2019, 2017 only with windows-latest; VS 2015 only with
windows-2019
+          - os: windows-2019
+            toolset: '14.2'
+          - os: windows-2019
+            toolset: '14.1'
+          - os: windows-latest
+            toolset: '14.0'
       fail-fast: false
-    runs-on: windows-latest
+    runs-on: ${{matrix.os}}
     steps:
     - name: Install ninja
       run: choco install -y ninja
@@ -115,7 +120,7 @@ jobs:
     - name: Configure
       run: cmake -S src -B build -G Ninja
-DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=${{matrix.arch}}
-DCMAKE_BUILD_TYPE=${{matrix.config}} -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1
     - name: Build
-      run: cmake --build build  -- -k0
+      run: cmake --build build -- -k0
     - name: Generate ISOs
       run: cmake --build build --target bootcd --target livecd
     - name: Upload ISOs