From 3fd3c0be57cf61a1eec857074ee23aaece23f613 Mon Sep 17 00:00:00 2001
From: Nadia Holmquist Pedersen <nadia@nhp.sh>
Date: Wed, 11 Dec 2024 12:35:07 +0100
Subject: [PATCH] let's see if this works

---
 .github/workflows/build-macos.yml | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index bd874b2036..26b7ab4393 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -41,11 +41,16 @@ jobs:
           configurePreset: release-mac-${{ matrix.arch }}
           buildPreset: release-mac-${{ matrix.arch }}
           configurePresetAdditionalArgs: "['-DMELONDS_EMBED_BUILD_INFO=ON']"
+      - name: Prepare app bundle
+        shell: bash
+        run: |
+          mkdir app
+          mv build/release-mac-${{ matrix.arch }}/melonDS.app app
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
           name: macOS-${{ matrix.arch }}
-          path: build/release-mac-${{ matrix.arch }}/melonDS.app
+          path: app
           retention-days: 1
 
   universal-binary:
@@ -67,17 +72,16 @@ jobs:
       - name: Combine app bundles
         shell: bash
         run: |
-          unzip x86_64/*.zip -d x86_64
-          unzip arm64/*.zip -d arm64
           lipo {x86_64,arm64}/melonDS.app/Contents/MacOS/melonDS -create -output melonDS
-          cp -a arm64/melonDS.app melonDS.app
-          cp melonDS melonDS.app/Contents/MacOS/melonDS
-          codesign -s - --deep melonDS.app
+          mkdir app
+          cp -a arm64/melonDS.app app
+          cp melonDS app/melonDS.app/Contents/MacOS/melonDS
+          codesign -s - --deep app/melonDS.app
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
           name: macOS-universal
-          path: melonDS.app
+          path: app
 #     - name: Clean up architecture-specific artifacts
 #       uses: geekyeggo/delete-artifact@v4
 #       with: