From 3b7d69a644f80a3b85afcdcfcd8b29997ed95c66 Mon Sep 17 00:00:00 2001
From: Nadia Holmquist Pedersen <nadia@nhp.sh>
Date: Thu, 28 Dec 2023 13:28:23 +0100
Subject: [PATCH] let's try it again, but better this time

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

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index 09bfb81d..0370b2a9 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -27,7 +27,10 @@ jobs:
           configurePreset: release-mac-${{ matrix.arch }}
           buildPreset: release-mac-${{ matrix.arch }}
       - name: Compress app bundle
-        run: zip -r -y macOS-${{ matrix.arch }}.zip build/release-mac-${{ matrix.arch }}/melonDS.app
+        shell: bash
+        run: |
+          cd build/release-mac-${{ matrix.arch }}
+          zip -r -y ../../macOS-${{ matrix.arch }}.zip melonDS.app
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
@@ -49,10 +52,12 @@ jobs:
         with:
           name: macOS-arm64
           path: arm64
-      - run: find . -type d
+      - run: find .
       - name: Combine app bundles
-        shell: zsh
+        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