@@ -12,14 +12,25 @@ permissions:
1212defaults :
1313 run :
1414 shell : cmd
15-
15+
1616jobs :
1717
1818 build :
1919 strategy :
2020 matrix :
2121 os : [windows-2022, windows-2025, windows-11-arm]
2222 config : [Release, Debug]
23+ generator : ["Visual Studio 17 2022"]
24+ sln : ["sln"]
25+ include :
26+ - os : windows-2025-vs2026
27+ config : Release
28+ generator : " Visual Studio 18 2026"
29+ sln : " slnx"
30+ - os : windows-2025-vs2026
31+ config : Debug
32+ generator : " Visual Studio 18 2026"
33+ sln : " slnx"
2334 fail-fast : false
2435
2536 runs-on : ${{ matrix.os }}
@@ -45,12 +56,12 @@ jobs:
4556
4657 - name : Run CMake
4758 run : |
48- cmake -G "Visual Studio 17 2022 " -A x64 -Werror=dev --warn-uninitialized -DCMAKE_COMPILE_WARNING_AS_ERROR=On . || exit /b !errorlevel!
59+ cmake -G "${{ matrix.generator }} " -A x64 -Werror=dev --warn-uninitialized -DCMAKE_COMPILE_WARNING_AS_ERROR=On . || exit /b !errorlevel!
4960
5061 - name : Build
5162 run : |
52- msbuild -m simplecpp.sln /p:Configuration=${{ matrix.config }} /p:Platform=x64 || exit /b !errorlevel!
53-
63+ msbuild -m simplecpp.${{ matrix. sln }} /p:Configuration=${{ matrix.config }} /p:Platform=x64 || exit /b !errorlevel!
64+
5465 - name : Test
5566 run : |
5667 .\${{ matrix.config }}\testrunner.exe || exit /b !errorlevel!
@@ -66,17 +77,17 @@ jobs:
6677
6778 - name : Run CMake (c++17)
6879 run : |
69- cmake -S . -B build.cxx17 -G "Visual Studio 17 2022 " -A x64 -Werror=dev --warn-uninitialized -DCMAKE_CXX_STANDARD=17 -DCMAKE_COMPILE_WARNING_AS_ERROR=On || exit /b !errorlevel!
80+ cmake -S . -B build.cxx17 -G "${{ matrix.generator }} " -A x64 -Werror=dev --warn-uninitialized -DCMAKE_CXX_STANDARD=17 -DCMAKE_COMPILE_WARNING_AS_ERROR=On || exit /b !errorlevel!
7081
7182 - name : Build (c++17)
7283 run : |
73- msbuild -m build.cxx17\simplecpp.sln /p:Configuration=${{ matrix.config }} /p:Platform=x64 || exit /b !errorlevel!
84+ msbuild -m build.cxx17\simplecpp.${{ matrix. sln }} /p:Configuration=${{ matrix.config }} /p:Platform=x64 || exit /b !errorlevel!
7485
7586 - name : Run CMake (c++20)
7687 run : |
77- cmake -S . -B build.cxx20 -G "Visual Studio 17 2022 " -A x64 -Werror=dev --warn-uninitialized -DCMAKE_CXX_STANDARD=20 -DCMAKE_COMPILE_WARNING_AS_ERROR=On || exit /b !errorlevel!
88+ cmake -S . -B build.cxx20 -G "${{ matrix.generator }} " -A x64 -Werror=dev --warn-uninitialized -DCMAKE_CXX_STANDARD=20 -DCMAKE_COMPILE_WARNING_AS_ERROR=On || exit /b !errorlevel!
7889
7990 - name : Build (c++20)
8091 run : |
81- msbuild -m build.cxx20\simplecpp.sln /p:Configuration=${{ matrix.config }} /p:Platform=x64 || exit /b !errorlevel!
92+ msbuild -m build.cxx20\simplecpp.${{ matrix. sln }} /p:Configuration=${{ matrix.config }} /p:Platform=x64 || exit /b !errorlevel!
8293
0 commit comments