From 8fbbef99ca63f55d62dab5606e4d8823a65a657d Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Tue, 16 Jun 2026 15:19:10 +0200 Subject: [PATCH] GHA: Windows: explicitly install Visual Studio 2022 (again) The `windows-2025` image upgraded from VS 2022 to VS 2026, so VS 2022 isn't pre-installed anymore. --- doc/win-dev.ps1 | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/doc/win-dev.ps1 b/doc/win-dev.ps1 index dd079318dea..67fa02822df 100644 --- a/doc/win-dev.ps1 +++ b/doc/win-dev.ps1 @@ -70,7 +70,10 @@ try { $Env:Path += $ChocoPath } -# GitHub Actions uses an image that comes with most dependencies preinstalled. Don't install them twice. +# GitHub Actions uses an image that comes with some dependencies preinstalled. +# Don't install them twice. +# It also comes with VS 2026, but our build server currently uses VS 2022, see: +# https://github.com/Icinga/icinga2/issues/10885 if (-not $Env:GITHUB_ACTIONS) { choco install -y ` "visualstudio${VsVersion}community" ` @@ -87,7 +90,14 @@ if (-not $Env:GITHUB_ACTIONS) { wixtoolset ThrowOnNativeFailure } else { - choco install -y winflexbison3 + choco install -y ` + "visualstudio${VsVersion}community" ` + "visualstudio${VsVersion}-workload-vctools" ` + "visualstudio${VsVersion}-workload-manageddesktop" ` + "visualstudio${VsVersion}-workload-nativedesktop" ` + "visualstudio${VsVersion}-workload-universal" ` + "visualstudio${VsVersion}buildtools" ` + winflexbison3 ThrowOnNativeFailure }