From 4027e7e59599a6b93e0707e59570c6ac77d12918 Mon Sep 17 00:00:00 2001
From: Nadia Holmquist Pedersen <nadia@nhp.sh>
Date: Wed, 11 Dec 2024 12:59:20 +0100
Subject: [PATCH] well that didn't work so let's maybe dmg it instead

---
 .github/workflows/build-macos.yml | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index 26b7ab43..bac86e9a 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -45,12 +45,13 @@ jobs:
         shell: bash
         run: |
           mkdir app
-          mv build/release-mac-${{ matrix.arch }}/melonDS.app app
+          zip -r -y macOS-${{ matrix.arch }}.zip \
+            build/release-mac-${{ matrix.arch }}/melonDS.app
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
           name: macOS-${{ matrix.arch }}
-          path: app
+          path: macOS-${{ matrix.arch }}.zip
           retention-days: 1
 
   universal-binary:
@@ -68,24 +69,21 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: macOS-arm64
-          path: arm64
       - name: Combine app bundles
         shell: bash
         run: |
-          lipo {x86_64,arm64}/melonDS.app/Contents/MacOS/melonDS -create -output melonDS
-          mkdir app
-          cp -a arm64/melonDS.app app
-          cp melonDS app/melonDS.app/Contents/MacOS/melonDS
-          codesign -s - --deep app/melonDS.app
+          uznip x86_64/melonDS-x86_64.zip -d x86_64
+          unzip melonDS-arm64.zip
+          lipo {.,x86_64}/melonDS.app/Contents/MacOS/melonDS -create -output melonDS
+          cp melonDS melonDS.app/Contents/MacOS/melonDS
+      - name: Create disk image
+        shell: bash
+        run: |
+          ln -s /Applications app/Applications
+          hdiutil create -fs HFS+ -volname melonDS -srcfolder app -ov -format UDBZ melonDS.dmg
+          codesign -s - --deep melonDS.dmg
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
           name: macOS-universal
-          path: app
-#     - name: Clean up architecture-specific artifacts
-#       uses: geekyeggo/delete-artifact@v4
-#       with:
-#         failOnError: false
-#         name: |
-#           macOS-x86_64
-#           macOS-arm64
+          path: melonDS.dmg