Trying to fix macOS buildsd

vitor251093 · Jun 7, 2024 · fa5e02c · fa5e02c
1 parent ecd1f5d
commit fa5e02c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git 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,21 +67,14 @@ 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
         uses: actions/upload-artifact@v4
         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
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
     <key>CFBundleExecutable</key>
-    <string>khDaysMM</string>
+    <string>melonDS</string>
     <key>CFBundleIconFile</key>
     <string>khDaysMM.icns</string>
     <key>CFBundleIdentifier</key>