From 0aa2ceffec363ebcff9afff9317c02abaf2fb581 Mon Sep 17 00:00:00 2001
From: mctaylors <cantsendmails@mctaylors.ru>
Date: Thu, 5 Mar 2026 14:35:34 +0300
Subject: [PATCH] actions(macos): keep .zip and upload .dmg on release

Signed-off-by: mctaylors <cantsendmails@mctaylors.ru>
---
 .github/actions/package/macos/action.yml | 14 +++++++++++---
 .github/workflows/release.yml            |  2 ++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/.github/actions/package/macos/action.yml b/.github/actions/package/macos/action.yml
index af941b59d..aa370862e 100644
--- a/.github/actions/package/macos/action.yml
+++ b/.github/actions/package/macos/action.yml
@@ -91,10 +91,10 @@ runs:
             --password '${{ inputs.apple-notarize-password }}'
 
           xcrun stapler staple "Prism Launcher.app"
-          rm "../PrismLauncher.zip"
         else
           echo ":warning: Skipping notarization as credentials are not present." >> $GITHUB_STEP_SUMMARY
         fi
+        ditto -c -k --sequesterRsrc --keepParent "Prism Launcher.app" ../PrismLauncher.zip
 
     - name: Create DMG
       shell: bash
@@ -119,11 +119,13 @@ runs:
       run: |
         if [ '${{ inputs.sparkle-ed25519-key }}' != '' ]; then
           echo '${{ inputs.sparkle-ed25519-key }}' > ed25519-priv.pem
-          signature=$(/opt/homebrew/opt/openssl@3/bin/openssl pkeyutl -sign -rawin -in ${{ github.workspace }}/PrismLauncher.dmg -inkey ed25519-priv.pem | openssl base64 | tr -d \\n)
+          signature-zip=$(/opt/homebrew/opt/openssl@3/bin/openssl pkeyutl -sign -rawin -in ${{ github.workspace }}/PrismLauncher.zip -inkey ed25519-priv.pem | openssl base64 | tr -d \\n)
+          signature-dmg=$(/opt/homebrew/opt/openssl@3/bin/openssl pkeyutl -sign -rawin -in ${{ github.workspace }}/PrismLauncher.dmg -inkey ed25519-priv.pem | openssl base64 | tr -d \\n) 
           rm ed25519-priv.pem
           cat >> $GITHUB_STEP_SUMMARY << EOF
         ### Artifact Information :information_source:
-        - :memo: Sparkle Signature (ed25519): \`$signature\`
+        - :memo: Sparkle Signature (ed25519): \`$signature-zip\` (ZIP)
+        - :memo: Sparkle Signature (ed25519): \`$signature-dmg\` (DMG)
         EOF
         else
           cat >> $GITHUB_STEP_SUMMARY << EOF
@@ -133,6 +135,12 @@ runs:
         fi
 
     - name: Upload binary tarball
+      uses: actions/upload-artifact@v6
+      with:
+        name: PrismLauncher-${{ inputs.artifact-name }}-${{ inputs.version }}-${{ inputs.build-type }}
+        path: PrismLauncher.zip
+
+    - name: Upload disk image
       uses: actions/upload-artifact@v6
       with:
         name: PrismLauncher-${{ inputs.artifact-name }}-${{ inputs.version }}-${{ inputs.build-type }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c68c5bc93..fefa16e49 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -51,6 +51,7 @@ jobs:
           mv PrismLauncher-*.AppImage/PrismLauncher-*-aarch64.AppImage PrismLauncher-Linux-aarch64.AppImage
           mv PrismLauncher-*.AppImage.zsync/PrismLauncher-*-aarch64.AppImage.zsync PrismLauncher-Linux-aarch64.AppImage.zsync
           mv PrismLauncher-macOS*/PrismLauncher.zip PrismLauncher-macOS-${{ env.VERSION }}.zip
+          mv PrismLauncher-macOS*/PrismLauncher.dmg PrismLauncher-macOS-${{ env.VERSION }}.dmg
 
           tar --exclude='.git' -czf PrismLauncher-${{ env.VERSION }}.tar.gz PrismLauncher-${{ env.VERSION }}
 
@@ -121,4 +122,5 @@ jobs:
             PrismLauncher-Windows-MSVC-Portable-${{ env.VERSION }}.zip
             PrismLauncher-Windows-MSVC-Setup-${{ env.VERSION }}.exe
             PrismLauncher-macOS-${{ env.VERSION }}.zip
+            PrismLauncher-macOS-${{ env.VERSION }}.dmg
             PrismLauncher-${{ env.VERSION }}.tar.gz