From 5244313b30cc5e0c4a27b48e5dfb234ff3824a4e Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Sun, 26 Oct 2025 21:54:19 -0500
Subject: [PATCH] Improve archiving of Windows CI builds

---
 .github/workflows/build-win-mac.yml | 32 +++++++++++++++++------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build-win-mac.yml b/.github/workflows/build-win-mac.yml
index a390da79..4c8702f6 100644
--- a/.github/workflows/build-win-mac.yml
+++ b/.github/workflows/build-win-mac.yml
@@ -84,22 +84,28 @@ jobs:
             bash scripts/generate-dmg.sh Release
           }
 
-      - name: Collect Artifacts
-        shell: pwsh
-        run: |
-          New-Item -Path archive -ItemType Directory
-          if ($Env:RUNNER_OS -eq "Windows") {
-            Copy-Item -Path "build/installer-x64-release/*" -Destination archive
-            Copy-Item -Path "build/installer-arm64-release/*" -Destination archive
-          } else {
-            Copy-Item -Path "build/installer-Release/*.dmg" -Destination archive
-          }
-
-      - name: Upload Binaries
+      - name: Upload Binaries (Windows x64)
         uses: actions/upload-artifact@v4
+        if: runner.os == 'Windows'
+        with:
+          name: Moonlight-${{ runner.os }}-x64-${{ env.CI_VERSION }}
+          path: build/deploy-x64-release/*
+          if-no-files-found: error
+
+      - name: Upload Binaries (Windows arm64)
+        uses: actions/upload-artifact@v4
+        if: runner.os == 'Windows'
+        with:
+          name: Moonlight-${{ runner.os }}-arm64-${{ env.CI_VERSION }}
+          path: build/deploy-arm64-release/*
+          if-no-files-found: error
+
+      - name: Upload Binaries (macOS)
+        uses: actions/upload-artifact@v4
+        if: runner.os == 'macOS'
         with:
           name: Moonlight-${{ runner.os }}-${{ env.CI_VERSION }}
-          path: archive/*
+          path: build/installer-Release/*.dmg
           compression-level: 0
           if-no-files-found: error