From c9d5e4ebbad82dc515accde0d5b79e956d989236 Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Fri, 24 Jul 2026 15:49:28 +0200
Subject: [PATCH] tweak visual studio test build

---
 .ci/compile.sh                      | 8 ++++----
 .github/workflows/desktop-build.yml | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.ci/compile.sh b/.ci/compile.sh
index ae6284478..5c5e737cd 100755
--- a/.ci/compile.sh
+++ b/.ci/compile.sh
@@ -259,7 +259,7 @@ if [[ $RUNNER_OS == macOS ]]; then
 
 elif [[ $RUNNER_OS == Windows ]]; then
   if [[ "$CMAKE_GENERATOR" =~ ^Visual\ Studio ]]; then
-  # Enable MTT, see https://devblogs.microsoft.com/cppblog/improved-parallelism-in-msbuild/
+  # Enable MSBuild switches for MTT, see https://devblogs.microsoft.com/cppblog/improved-parallelism-in-msbuild/
   # and https://devblogs.microsoft.com/cppblog/cpp-build-throughput-investigation-and-tune-up/#multitooltask-mtt
   buildflags+=(-- -p:UseMultiToolTask=true -p:EnableClServerMode=true)
   fi
@@ -275,15 +275,15 @@ fi
 echo "::group::Configure CMake"
 cmake --version
   if [[ "$CMAKE_GENERATOR" =~ ^Ninja ]]; then
-  ninja --version
+  echo "ninja $(ninja --version)"
   fi
-echo "Running cmake with flags: ${flags[*]}"
+echo "Running CMake with these flags: ${flags[*]}"
 cmake .. "${flags[@]}"
 echo "::endgroup::"
 
 # Build
 echo "::group::Build project"
-echo "Running cmake --build with flags: ${buildflags[*]}"
+echo "Running CMake with these build flags: ${buildflags[*]}"
 cmake --build . --verbose "${buildflags[@]}"
 echo "::endgroup::"
 
diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index 020cd908f..6c1e475f3 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -338,7 +338,7 @@ jobs:
             cmake_generator: "Visual Studio 18 2026"
             cmake_generator_platform: x64
             make_package: 1
-            package_suffix: "-Win10"
+            package_suffix: "-Win10_VS"
             qt_version: 6.11.0
             qt_modules: qtimageformats qtmultimedia qtwebsockets
             type: Release
@@ -538,7 +538,7 @@ jobs:
           path: ${{ steps.build.outputs.path }}
 
       - name: "[Windows] Upload PDBs (Program Databases)"
-        if: matrix.os == 'Windows' && github.ref_type != 'tag'
+        if: matrix.os == 'Windows' && github.ref_type != 'tag' && matrix.cmake_generator == 'Ninja'
         uses: actions/upload-artifact@v7
         with:
           if-no-files-found: error