well that didn't work so let's maybe dmg it instead

This commit is contained in:
Nadia Holmquist Pedersen 2024-12-11 12:59:20 +01:00
parent 3fd3c0be57
commit 4027e7e595
1 changed files with 14 additions and 16 deletions

View File

@ -45,12 +45,13 @@ jobs:
shell: bash shell: bash
run: | run: |
mkdir app 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 - name: Upload artifact
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: macOS-${{ matrix.arch }} name: macOS-${{ matrix.arch }}
path: app path: macOS-${{ matrix.arch }}.zip
retention-days: 1 retention-days: 1
universal-binary: universal-binary:
@ -68,24 +69,21 @@ jobs:
uses: actions/download-artifact@v4 uses: actions/download-artifact@v4
with: with:
name: macOS-arm64 name: macOS-arm64
path: arm64
- name: Combine app bundles - name: Combine app bundles
shell: bash shell: bash
run: | run: |
lipo {x86_64,arm64}/melonDS.app/Contents/MacOS/melonDS -create -output melonDS uznip x86_64/melonDS-x86_64.zip -d x86_64
mkdir app unzip melonDS-arm64.zip
cp -a arm64/melonDS.app app lipo {.,x86_64}/melonDS.app/Contents/MacOS/melonDS -create -output melonDS
cp melonDS app/melonDS.app/Contents/MacOS/melonDS cp melonDS melonDS.app/Contents/MacOS/melonDS
codesign -s - --deep app/melonDS.app - 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 - name: Upload artifact
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: macOS-universal name: macOS-universal
path: app path: melonDS.dmg
# - name: Clean up architecture-specific artifacts
# uses: geekyeggo/delete-artifact@v4
# with:
# failOnError: false
# name: |
# macOS-x86_64
# macOS-arm64