Skip to content

Commit

Permalink
[GITHUB] Fix builds by dropping VS2017 and retargeting to VS2022 (rea…
Browse files Browse the repository at this point in the history
…ctos#6899)

GitHub dropped VS2017 in the windows-latest runner:
- actions/runner-images#9701
- ilammy/msvc-dev-cmd#80

Addendum to 0f81f46.
  • Loading branch information
maj113 authored and binarymaster committed May 17, 2024
1 parent 3285f69 commit 503e68f
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand All @@ -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
Expand Down Expand Up @@ -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: |
Expand All @@ -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

0 comments on commit 503e68f

Please sign in to comment.