From 6be4d0ce092627ac1929fdd7cd9f1f6d1806286f Mon Sep 17 00:00:00 2001
From: Firelight Flagboy <firelight.flagboy@gmail.com>
Date: Thu, 5 Sep 2024 09:17:46 +0200
Subject: [PATCH] Add `dmg` + `zip` to artifact for macos build

Rework how the artifact is named to not use the extension but a suffix
---
 .github/workflows/package-client.yml | 13 ++++++++-----
 .github/workflows/releaser.yml       | 14 +++++++-------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/package-client.yml b/.github/workflows/package-client.yml
index eef2771f7cc..cf82e6d98f7 100644
--- a/.github/workflows/package-client.yml
+++ b/.github/workflows/package-client.yml
@@ -204,7 +204,7 @@ jobs:
 
       - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # pin v4.4.0
         with:
-          name: ${{ runner.os }}-${{ runner.arch }}-electron-app-snap
+          name: linux-snap-${{ runner.arch }}-electron
           path: |
             Parsec_${{ steps.version.outputs.full }}_linux_*.snap
             Parsec-SBOM-*.spdx.json
@@ -225,18 +225,21 @@ jobs:
             raw_latest_file: latest.yml
             extension: exe
             os_alias: win
+            artifact_tag: windows-exe
           - name: 🍎 macOS
             platform: macos
             os: macos-12
             raw_latest_file: latest-mac.yml
-            extension: dmg
+            extension: "*" # Use wildcard to match dmg and zip extension
             os_alias: mac
+            artifact_tag: macos-dmg
           - name: 🐧 AppImage 4 Linux
             platform: linux
             os: ubuntu-22.04
             raw_latest_file: latest-linux.yml
             os_alias: linux
             extension: AppImage
+            artifact_tag: linux-appimage
     name: "${{matrix.name }}: ⚡ Package electron"
     runs-on: ${{ matrix.os }}
     timeout-minutes: 60
@@ -352,7 +355,7 @@ jobs:
           tool: syft@0.84.0
 
       - name: Generate SBOM
-        run: syft packages --config=.syft.yaml --output=spdx-json=client/electron/dist/Parsec-SBOM-Electron-${{ matrix.platform }}-${{ matrix.extension }}.spdx.json .
+        run: syft packages --config=.syft.yaml --output=spdx-json=client/electron/dist/Parsec-SBOM-Electron-${{ matrix.artifact_tag }}.spdx.json .
 
       - name: Debug dist folder
         if: runner.debug || false
@@ -385,7 +388,7 @@ jobs:
 
       - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # pin v4.4.0
         with:
-          name: ${{ runner.os }}-${{ runner.arch }}-electron-app-${{ matrix.extension }}
+          name: ${{ matrix.artifact_tag }}-${{ runner.arch }}-electron
           path: |
             client/electron/dist/${{ steps.build-info.outputs.app_file }}
             client/electron/dist/${{ steps.build-info.outputs.app_file }}.blockmap
@@ -397,7 +400,7 @@ jobs:
       - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # pin v4.4.0
         if: matrix.platform == 'windows'
         with:
-          name: ${{ runner.os }}-${{ runner.arch }}-electron-app-${{ matrix.extension }}-pre-built
+          name: ${{ matrix.artifact_tag }}-${{ runner.arch }}-electron-pre-built
           path: |
             client/electron/app
             client/electron/build
diff --git a/.github/workflows/releaser.yml b/.github/workflows/releaser.yml
index 9f6fdd89d0f..85ba5c0febc 100644
--- a/.github/workflows/releaser.yml
+++ b/.github/workflows/releaser.yml
@@ -109,19 +109,19 @@ jobs:
           cp ${CP_ARGS} artifacts/Windows-X64-wheel/requirements.txt release-files/python-win-requirements.txt
 
           # Snapcraft
-          cp ${CP_ARGS} artifacts/Linux-X64-electron-app-snap/Parsec_${{ needs.version.outputs.full }}_linux_*.snap release-files
+          cp ${CP_ARGS} artifacts/linux-snap-X64-electron/Parsec_${{ needs.version.outputs.full }}_linux_*.snap release-files
 
           # AppImage
-          cp ${CP_ARGS} artifacts/Linux-X64-electron-app-AppImage/Parsec_${{ needs.version.outputs.full }}_linux_*.AppImage release-files
-          cp ${CP_ARGS} artifacts/Linux-X64-electron-app-AppImage/latest-linux-*.yml release-files
+          cp ${CP_ARGS} artifacts/linux-appimage-X64-electron/Parsec_${{ needs.version.outputs.full }}_linux_*.AppImage release-files
+          cp ${CP_ARGS} artifacts/linux-appimage-X64-electron/latest-linux-*.yml release-files
 
           # DMG & ZIP
-          cp ${CP_ARGS} artifacts/macOS-X64-electron-app-dmg/Parsec_${{ needs.version.outputs.full }}_mac_*.unsigned{.dmg,.zip}{,.blockmap} release-files
-          cp ${CP_ARGS} artifacts/macOS-X64-electron-app-dmg/latest-mac-*.yml release-files
+          cp ${CP_ARGS} artifacts/macos-dmg-X64-electron/Parsec_${{ needs.version.outputs.full }}_mac_*.unsigned{.dmg,.zip}{,.blockmap} release-files
+          cp ${CP_ARGS} artifacts/macos-dmg-X64-electron/latest-mac-*.yml release-files
 
           # EXE
-          cp ${CP_ARGS} artifacts/Windows-X64-electron-app-exe/Parsec_${{ needs.version.outputs.full }}_win_*.unsigned.exe{,.blockmap} release-files
-          cp ${CP_ARGS} artifacts/Windows-X64-electron-app-exe/latest-win-*.yml release-files
+          cp ${CP_ARGS} artifacts/windows-exe-X64-electron/Parsec_${{ needs.version.outputs.full }}_win_*.unsigned.exe{,.blockmap} release-files
+          cp ${CP_ARGS} artifacts/windows-exe-X64-electron/latest-win-*.yml release-files
 
           # CLI
           cp ${CP_ARGS} artifacts/Linux-X64-cli/parsec-cli_${{ needs.version.outputs.full }}_linux_* release-files