mirror of
https://github.com/reactos/reactos.git
synced 2024-12-26 17:14:41 +00:00
[GITHUB] Fix builds by dropping VS2017 and retargeting to VS2022 (#6899)
GitHub dropped VS2017 in the windows-latest runner:
- https://github.com/actions/runner-images/issues/9701
- https://github.com/ilammy/msvc-dev-cmd/issues/80
Addendum to 0f81f46387
.
This commit is contained in:
parent
3285f698fd
commit
503e68f2c9
1 changed files with 9 additions and 8 deletions
17
.github/workflows/build.yml
vendored
17
.github/workflows/build.yml
vendored
|
@ -85,13 +85,13 @@ jobs:
|
|||
strategy:
|
||||
matrix:
|
||||
os: [windows-latest]
|
||||
toolset: ['14.2', '14.1'] # VS 2019, and 2017 (see below)
|
||||
toolset: ['14.3','14.2'] # VS 2022, and 2019 (see below)
|
||||
arch: [i386, amd64]
|
||||
config: [Debug, Release]
|
||||
dllver: ['0x502', '0x600']
|
||||
exclude: # VS 2019, 2017 only with windows-latest
|
||||
exclude: # Build NT6 ISOs only with the latest toolset when compiled as a debug build
|
||||
- dllver: 0x600
|
||||
toolset: '14.1'
|
||||
toolset: 14.2
|
||||
- dllver: 0x600
|
||||
config: Release
|
||||
fail-fast: false
|
||||
|
@ -145,7 +145,7 @@ jobs:
|
|||
build-msvc-arm:
|
||||
strategy:
|
||||
matrix:
|
||||
toolset: ['14.2', '14.1'] # VS 2019, 2017
|
||||
toolset: ['14.3','14.2'] # VS 2022, 2019
|
||||
arch: [arm, arm64]
|
||||
config: [Debug, Release]
|
||||
fail-fast: false
|
||||
|
@ -222,6 +222,7 @@ jobs:
|
|||
name: reactos-syms-msvc${{matrix.toolset}}-${{matrix.arch}}-${{matrix.config}}-${{github.sha}}
|
||||
path: build/msvc_pdb
|
||||
|
||||
# FIXME: Does not boot on toolset 14.1, 14.3 is untested
|
||||
build-clang-cl:
|
||||
strategy:
|
||||
matrix:
|
||||
|
@ -248,13 +249,13 @@ jobs:
|
|||
uses: ilammy/msvc-dev-cmd@v1
|
||||
with:
|
||||
arch: amd64_x86
|
||||
toolset: '14.1' # latest masm build known to make bootable builds
|
||||
toolset: '14.3'
|
||||
- name: Activate VS cmd (amd64)
|
||||
if: ${{ matrix.arch == 'amd64' }}
|
||||
uses: ilammy/msvc-dev-cmd@v1
|
||||
with:
|
||||
arch: amd64
|
||||
toolset: '14.1' # latest masm build known to make bootable builds
|
||||
toolset: '14.3'
|
||||
- name: Add LLVM to PATH
|
||||
run: echo "${env:LLVM_PATH}" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
|
||||
- name: Source checkout
|
||||
|
@ -283,7 +284,7 @@ jobs:
|
|||
|
||||
build-msbuild-i386:
|
||||
name: MSBuild (i386)
|
||||
runs-on: windows-2019
|
||||
runs-on: windows-latest
|
||||
steps:
|
||||
- name: Install Flex and Bison
|
||||
run: |
|
||||
|
@ -303,6 +304,6 @@ jobs:
|
|||
run: |
|
||||
mkdir build
|
||||
cd build
|
||||
cmake -G "Visual Studio 16 2019" -A Win32 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=i386 -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 ${{github.workspace}}\src
|
||||
cmake -G "Visual Studio 17 2022" -A Win32 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=i386 -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 ${{github.workspace}}\src
|
||||
- name: Build
|
||||
run: cmake --build ${{github.workspace}}\build --target bootcd --target livecd
|
||||
|
|
Loading…
Reference in a new issue