Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 21:45:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

[GITHUB] Fix MSVC 2015 (v14.0) build, until a clear consensus is reached for PR #3872 (#4454)

Browse source 
CORE-18146

Use the matrix.os + include/exclude technique, as suggested
by Serge Gautherie :)
This commit is contained in:
Hermès Bélusca-Maïto 2022-04-17 02:26:13 +02:00
parent 1170a5a493
commit 0d08c6429d
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
1 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
.github/workflows/build.yml vendored
View file

@ -78,14 +78,19 @@ jobs:
build-msvc: build-msvc:
strategy: strategy:
matrix: 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] arch: [i386, amd64]
config: [Debug, Release] config: [Debug, Release]
include: exclude: # VS 2019, 2017 only with windows-latest; VS 2015 only with windows-2019
- arch: i386 # Not compiling on amd64 prompt - os: windows-2019
toolset: '14.0' # VS 2015 toolset: '14.2'
- os: windows-2019
toolset: '14.1'
- os: windows-latest
toolset: '14.0'
fail-fast: false fail-fast: false
runs-on: windows-latest runs-on: ${{matrix.os}}
steps: steps:
- name: Install ninja - name: Install ninja
run: choco install -y ninja run: choco install -y ninja
@ -115,7 +120,7 @@ jobs:
- name: Configure - 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 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 - name: Build
run: cmake --build build -- -k0 run: cmake --build build -- -k0
- name: Generate ISOs - name: Generate ISOs
run: cmake --build build --target bootcd --target livecd run: cmake --build build --target bootcd --target livecd
- name: Upload ISOs - name: Upload ISOs