From fa5e02c93634b28b4df5bc9780d4b3d45ed68370 Mon Sep 17 00:00:00 2001 From: VitorMM Date: Fri, 7 Jun 2024 20:16:59 -0300 Subject: [PATCH] Trying to fix macOS buildsd --- .github/workflows/build-macos.yml | 16 +++++----------- res/khDaysMM.plist.in | 2 +- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml index fbcb293c93..c9a221d214 100644 --- a/.github/workflows/build-macos.yml +++ b/.github/workflows/build-macos.yml @@ -37,7 +37,8 @@ jobs: shell: bash run: | cd build/release-mac-${{ matrix.arch }} - zip -r -y ../../macOS-${{ matrix.arch }}.zip melonDS.app + mv melonDS.app khDaysMM.app + zip -r -y ../../macOS-${{ matrix.arch }}.zip khDaysMM.app - name: Upload artifact uses: actions/upload-artifact@v4 with: @@ -66,10 +67,10 @@ jobs: run: | unzip x86_64/*.zip -d x86_64 unzip arm64/*.zip -d arm64 - lipo {x86_64,arm64}/melonDS.app/Contents/MacOS/melonDS -create -output khDaysMM - cp -a arm64/melonDS.app khDaysMM.app + lipo {x86_64,arm64}/khDaysMM.app/Contents/MacOS/melonDS -create -output melonDS + cp -a arm64/khDaysMM.app khDaysMM.app rm khDaysMM.app/Contents/MacOS/melonDS - cp khDaysMM khDaysMM.app/Contents/MacOS/khDaysMM + cp melonDS khDaysMM.app/Contents/MacOS/melonDS codesign -s - --deep khDaysMM.app zip -r -y macOS-universal.zip khDaysMM.app - name: Upload artifact @@ -77,10 +78,3 @@ jobs: with: name: macOS-universal path: macOS-universal.zip -# - name: Clean up architecture-specific artifacts -# uses: geekyeggo/delete-artifact@v4 -# with: -# failOnError: false -# name: | -# macOS-x86_64 -# macOS-arm64 diff --git a/res/khDaysMM.plist.in b/res/khDaysMM.plist.in index 72c0a905d7..59a42b1a38 100644 --- a/res/khDaysMM.plist.in +++ b/res/khDaysMM.plist.in @@ -3,7 +3,7 @@ CFBundleExecutable - khDaysMM + melonDS CFBundleIconFile khDaysMM.icns CFBundleIdentifier