let's see if this works

This commit is contained in:
Nadia Holmquist Pedersen 2024-12-11 12:35:07 +01:00
parent be471b876e
commit 3fd3c0be57
1 changed files with 11 additions and 7 deletions

View File

@ -41,11 +41,16 @@ jobs:
configurePreset: release-mac-${{ matrix.arch }} configurePreset: release-mac-${{ matrix.arch }}
buildPreset: release-mac-${{ matrix.arch }} buildPreset: release-mac-${{ matrix.arch }}
configurePresetAdditionalArgs: "['-DMELONDS_EMBED_BUILD_INFO=ON']" 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 - name: Upload artifact
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: macOS-${{ matrix.arch }} name: macOS-${{ matrix.arch }}
path: build/release-mac-${{ matrix.arch }}/melonDS.app path: app
retention-days: 1 retention-days: 1
universal-binary: universal-binary:
@ -67,17 +72,16 @@ jobs:
- name: Combine app bundles - name: Combine app bundles
shell: bash shell: bash
run: | 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 lipo {x86_64,arm64}/melonDS.app/Contents/MacOS/melonDS -create -output melonDS
cp -a arm64/melonDS.app melonDS.app mkdir app
cp melonDS melonDS.app/Contents/MacOS/melonDS cp -a arm64/melonDS.app app
codesign -s - --deep melonDS.app cp melonDS app/melonDS.app/Contents/MacOS/melonDS
codesign -s - --deep app/melonDS.app
- 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: melonDS.app path: app
# - name: Clean up architecture-specific artifacts # - name: Clean up architecture-specific artifacts
# uses: geekyeggo/delete-artifact@v4 # uses: geekyeggo/delete-artifact@v4
# with: # with: