From 66f229be7e4a117d5aea388f8d522289f11f0a3c Mon Sep 17 00:00:00 2001
From: PandaDEV <70103896+0PandaDEV@users.noreply.github.com>
Date: Sun, 22 Dec 2024 17:10:24 +1000
Subject: [PATCH] chore: improve artifact naming and organization in build
 workflows for macOS, Windows, and Ubuntu

---
 .github/workflows/build.yml | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7adbe1e..85e4c27 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -104,11 +104,11 @@ jobs:
           mv src-tauri/target/${{ matrix.args == '--target aarch64-apple-darwin' && 'aarch64-apple-darwin' || 'x86_64-apple-darwin' }}/release/bundle/macos/*.app.tar.gz.sig src-tauri/target/${{ matrix.args == '--target aarch64-apple-darwin' && 'aarch64-apple-darwin' || 'x86_64-apple-darwin' }}/release/bundle/macos/Qopy-${{ needs.prepare.outputs.version }}_${{ matrix.arch }}.app.tar.gz.sig
       - uses: actions/upload-artifact@v4
         with:
-          name: build-macos-dmg-${{ matrix.arch }}
+          name: macos-dmg-${{ matrix.arch }}
           path: src-tauri/target/${{ matrix.args == '--target aarch64-apple-darwin' && 'aarch64-apple-darwin' || 'x86_64-apple-darwin' }}/release/bundle/dmg/*.dmg
       - uses: actions/upload-artifact@v4
         with:
-          name: updater-files-macos-${{ matrix.arch }}
+          name: updater-macos-${{ matrix.arch }}
           path: |
             src-tauri/target/${{ matrix.args == '--target aarch64-apple-darwin' && 'aarch64-apple-darwin' || 'x86_64-apple-darwin' }}/release/bundle/macos/*.app.tar.gz
             src-tauri/target/${{ matrix.args == '--target aarch64-apple-darwin' && 'aarch64-apple-darwin' || 'x86_64-apple-darwin' }}/release/bundle/macos/*.app.tar.gz.sig
@@ -181,10 +181,16 @@ jobs:
           }
       - uses: actions/upload-artifact@v4
         with:
-          name: windows-${{ matrix.arch }}-binaries
+          name: windows-${{ matrix.arch }}
           path: |
             src-tauri/target/**/release/bundle/msi/*.msi
             src-tauri/target/**/release/bundle/msi/*.msi.sig
+      - uses: actions/upload-artifact@v4
+        with:
+          name: updater-windows-${{ matrix.arch }}
+          path: |
+            src-tauri/target/${{ matrix.target }}/release/Qopy.msi
+            src-tauri/target/${{ matrix.target }}/release/Qopy.msi.sig
 
   build-ubuntu:
     needs: prepare
@@ -230,9 +236,19 @@ jobs:
           mv src-tauri/target/x86_64-unknown-linux-gnu/release/bundle/rpm/*.rpm src-tauri/target/x86_64-unknown-linux-gnu/release/bundle/rpm/Qopy-${{ needs.prepare.outputs.version }}.rpm
       - uses: actions/upload-artifact@v4
         with:
-          name: linux-x64-binaries
+          name: ubuntu-deb
+          path: src-tauri/target/release/bundle/deb/*.deb
+      - uses: actions/upload-artifact@v4
+        with:
+          name: ubuntu-appimage
+          path: src-tauri/target/release/bundle/appimage/*.AppImage
+      - uses: actions/upload-artifact@v4
+        with:
+          name: ubuntu-rpm
+          path: src-tauri/target/release/bundle/rpm/*.rpm
+      - uses: actions/upload-artifact@v4
+        with:
+          name: updater-files-ubuntu
           path: |
-            src-tauri/target/x86_64-unknown-linux-gnu/release/bundle/deb/*.deb
-            src-tauri/target/x86_64-unknown-linux-gnu/release/bundle/appimage/*.AppImage
-            src-tauri/target/x86_64-unknown-linux-gnu/release/bundle/appimage/*.AppImage.sig
-            src-tauri/target/x86_64-unknown-linux-gnu/release/bundle/rpm/*.rpm
+            src-tauri/target/release/bundle/appimage/*.AppImage
+            src-tauri/target/release/bundle/appimage/*.AppImage.sig
\ No newline at end of file