ci: differentiate cmake windows build from the others

.github/workflows/scripts/common/name-artifacts.sh

@@ -8,6 +8,7 @@
 
 # Inputs as env-vars
 # OS
+# BUILD_SYSTEM
 # GUI_FRAMEWORK
 # ARCH
 # SIMD
@@ -26,6 +27,14 @@ else
   NAME="PCSX2-${OS}-${GUI_FRAMEWORK}-${ARCH}"
 fi
 
+# Add cmake if used to differentate it from msbuild builds
+# Else the two artifacts will have the same name and the files will be merged
+if [[ ! -z "${BUILD_SYSTEM}" ]]; then
+  if [ "${BUILD_SYSTEM}" == "cmake" ]; then
+    NAME="${NAME}-${BUILD_SYSTEM}"
+  fi
+fi
+
 # Add PR / Commit Metadata
 if [ "$EVENT_NAME" == "pull_request" ]; then
   PR_SHA=$(git rev-parse --short "${PR_SHA}")

.github/workflows/windows_build_matrix.yml

@@ -64,4 +64,5 @@ jobs:
     with:
       jobName: wxWidgets
       configuration: CMake
+      buildSystem: cmake
     secrets: inherit

.github/workflows/windows_build_qt.yml

@@ -21,6 +21,10 @@ on:
         required: false
         type: string
         default: AVX2
+      buildSystem:
+        required: false
+        type: string
+        default: msbuild
       qt_binary_url:
         required: false
         type: string
@@ -51,6 +55,7 @@ jobs:
         shell: bash
         env:
           OS: windows
+          BUILD_SYSTEM: ${{ inputs.buildSystem }}
           GUI_FRAMEWORK: Qt
           ARCH: ${{ inputs.platform }}
           SIMD: ${{ inputs.simd }}

.github/workflows/windows_build_wx.yml

@@ -18,6 +18,10 @@ on:
         required: false
         type: string
         default: AVX2
+      buildSystem:
+        required: false
+        type: string
+        default: msbuild
       configuration:
         required: true
         type: string
@@ -47,6 +51,7 @@ jobs:
         shell: bash
         env:
           OS: windows
+          BUILD_SYSTEM: ${{ inputs.buildSystem }}
           GUI_FRAMEWORK: wxWidgets
           ARCH: ${{ inputs.platform }}
           SIMD: ${{ inputs.simd }}