From 216114682d2e3f59fa456ffc2ebc60aa46d5f6f5 Mon Sep 17 00:00:00 2001 From: Stanislav Motylkov Date: Sat, 16 May 2026 16:23:05 +0300 Subject: [PATCH] [GITHUB] build-msbuild-i386: Prepare support for Visual Studio 18 2026 Add support for VS2026 as an MSBuild project generator by checking `VisualStudioVersion` environment variable. `windows-latest` builds will be affected by https://github.blog/changelog/2026-02-05-github-actions-early-february-2026-updates/#windows-server-2025-with-visual-studio-2026-image-now-available-for-github-hosted-runners > The migration to the new Visual Studio 2026 image will start on June 8, 2026. Closes #8998. --- .github/workflows/build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a829c20b0df..bf512c7b890 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -331,6 +331,8 @@ jobs: run: | mkdir build cd build - 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 + $GENERATOR = "Visual Studio 17 2022" + if ($env:VisualStudioVersion -ge "18") { $GENERATOR = "Visual Studio 18 2026" } + cmake -G $GENERATOR -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