Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
matrix:
configurations: [Debug, Release]
architecture: [x64, ARM64]
runs-on: windows-2022
runs-on: windows-2025-vs2026
env:
# Configuration type to build.
# You can convert this to a build matrix if you need coverage of multiple configuration types.
Expand All @@ -47,7 +47,7 @@ jobs:

- name: Generate Catch2 projects
working-directory: ${{env.GITHUB_WORKSPACE}}
run: cmake -G "Visual Studio 17 2022" -S external\catch2 -B external\catch2\build -DBUILD_TESTING=OFF -A ${{env.BUILD_PLATFORM}}
run: cmake -G "Visual Studio 18 2026" -S external\catch2 -B external\catch2\build -DBUILD_TESTING=OFF -A ${{env.BUILD_PLATFORM}}

- name: Build
working-directory: ${{env.GITHUB_WORKSPACE}}
Expand Down Expand Up @@ -90,16 +90,16 @@ jobs:
matrix:
configurations: [Debug, Release]
architecture: [x64, ARM64]
runs-on: windows-2022
runs-on: windows-2025-vs2026
env:
# Configuration type to build.
# You can convert this to a build matrix if you need coverage of multiple configuration types.
# https://docs.github.com/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
BUILD_CONFIGURATION: ${{matrix.configurations}}

BUILD_PLATFORM: ${{matrix.architecture}}
CMAKE_GENERATOR: Visual Studio 17 2022
PLATFORM_TOOLSET: v143
CMAKE_GENERATOR: Visual Studio 18 2026
PLATFORM_TOOLSET: v145
CXPLAT_MEMORY_LEAK_DETECTION: true
DUMP_PATH: c:/dumps/x64/${{matrix.configurations}}
TEST_TIMEOUT: 900 # 15 minute timeout for tests.
Expand All @@ -116,7 +116,7 @@ jobs:
working-directory: ${{env.GITHUB_WORKSPACE}}
shell: cmd
run: |
cmake -G "Visual Studio 17 2022" -S external\catch2 -B external\catch2\build -DBUILD_TESTING=OFF -A ${{env.BUILD_PLATFORM}}
cmake -G "Visual Studio 18 2026" -S external\catch2 -B external\catch2\build -DBUILD_TESTING=OFF -A ${{env.BUILD_PLATFORM}}
cmake -S . -B build -G "${{env.CMAKE_GENERATOR}}" -A ${{env.BUILD_PLATFORM}} -T ${{env.PLATFORM_TOOLSET}}

- name: Build the project
Expand Down