From 109c27e4086aa89dee93830825e386a3adb2b5bf Mon Sep 17 00:00:00 2001
From: Blisto91 <47954800+Blisto91@users.noreply.github.com>
Date: Mon, 4 Nov 2024 13:27:39 +0100
Subject: [PATCH] [CI] Make MSCV artifacts output match the regular artifact CI

Merges the two separate archives in to one and puts the dll and pdb files in a x32 and x64 folder.
Currently the two archives package the output in a folder called src and the files in subfolders of the respective names. E.g. `src/d3d9/d3d9.dll` etc.

This makes the MSCV artifacts archive match the regular artifacts CI output.
---
 .github/workflows/test-build-windows.yml | 26 ++++++++++++------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/test-build-windows.yml b/.github/workflows/test-build-windows.yml
index 44cdbbbabf4..46826b9f22c 100644
--- a/.github/workflows/test-build-windows.yml
+++ b/.github/workflows/test-build-windows.yml
@@ -54,14 +54,6 @@ jobs:
         meson --buildtype release --backend vs2022 build-msvc-x86
         msbuild -m build-msvc-x86/dxvk.sln
 
-    - name: Upload artifacts (x86)
-      uses: actions/upload-artifact@v4
-      with:
-        name: dxvk-${{ env.VERSION_NAME }}-msvc-x86-output
-        path: |
-          build-msvc-x86\**\*.pdb
-          build-msvc-x86\**\*.dll
-
     - name: Build MSVC x64
       shell: pwsh
       run: |
@@ -71,10 +63,18 @@ jobs:
         meson --buildtype release --backend vs2022 build-msvc-x64
         msbuild -m build-msvc-x64/dxvk.sln
 
-    - name: Upload artifacts (x64)
+    - name: Prepare artifacts
+      shell: pwsh
+      run: |
+        mkdir artifacts\x32
+        ls -Path build-msvc-x86\src -Include *.dll,*.pdb -Recurse
+          | cp -Destination (Join-Path -Path (pwd) -ChildPath artifacts\x32)
+        mkdir artifacts\x64
+        ls -Path build-msvc-x64\src -Include *.dll,*.pdb -Recurse
+          | cp -Destination (Join-Path -Path (pwd) -ChildPath artifacts\x64)
+
+    - name: Upload artifacts
       uses: actions/upload-artifact@v4
       with:
-        name: dxvk-${{ env.VERSION_NAME }}-msvc-amd64-output
-        path: |
-          build-msvc-x64\**\*.pdb
-          build-msvc-x64\**\*.dll
+        name: dxvk-${{ env.VERSION_NAME }}-msvc-output
+        path: artifacts\*