diff options
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/macos-compile.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/main.yml | 28 |
2 files changed, 19 insertions, 13 deletions
diff --git a/.github/workflows/macos-compile.yml b/.github/workflows/macos-compile.yml index d3c5dfbf8..59986d8fc 100644 --- a/.github/workflows/macos-compile.yml +++ b/.github/workflows/macos-compile.yml @@ -25,7 +25,9 @@ jobs: - name: Create Package run: | mkdir spaghetti-${{ matrix.config }} - mv build-cmake/Spaghettify spaghetti-${{ matrix.config }}/ + # The mac build now produces SpaghettiKart.app; zip with ditto so the + # executable bit survives artifact upload. + ditto -c -k --keepParent build-cmake/SpaghettiKart.app spaghetti-${{ matrix.config }}/SpaghettiKart.app.zip - name: Publish packaged artifacts uses: actions/upload-artifact@v4 with: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3b97f5122..16a0758d6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -107,13 +107,15 @@ jobs: path: ./build-cmake - name: Create Package run: | + APP=build-cmake/SpaghettiKart.app + # Insert the canonical spaghetti.o2r from the generate-port-o2r job and + # the controller database, then re-sign since the bundle contents changed. + cp build-cmake/spaghetti.o2r $APP/Contents/Resources/spaghetti.o2r + wget -O $APP/Contents/Resources/gamecontrollerdb.txt https://raw.githubusercontent.com/mdqinc/SDL_GameControllerDB/master/gamecontrollerdb.txt + codesign --force --deep --sign - --options runtime --entitlements cmake/macos/entitlements.plist $APP mkdir spaghetti-${{ matrix.config }} - mv build-cmake/Spaghettify spaghetti-${{ matrix.config }}/ - mv build-cmake/spaghetti.o2r spaghetti-${{ matrix.config }}/ - mv config.yml spaghetti-${{ matrix.config }}/ - mv yamls spaghetti-${{ matrix.config }}/ - mv meta spaghetti-${{ matrix.config }}/ - wget -O spaghetti-${{ matrix.config }}/gamecontrollerdb.txt https://raw.githubusercontent.com/mdqinc/SDL_GameControllerDB/master/gamecontrollerdb.txt + # Zip with ditto so the executable bit survives artifact upload. + ditto -c -k --keepParent $APP spaghetti-${{ matrix.config }}/SpaghettiKart.app.zip - name: Publish packaged artifacts if: matrix.config == 'Release' uses: actions/upload-artifact@v4 @@ -146,13 +148,15 @@ jobs: path: ./build-cmake - name: Create Package run: | + APP=build-cmake/SpaghettiKart.app + # Insert the canonical spaghetti.o2r from the generate-port-o2r job and + # the controller database, then re-sign since the bundle contents changed. + cp build-cmake/spaghetti.o2r $APP/Contents/Resources/spaghetti.o2r + wget -O $APP/Contents/Resources/gamecontrollerdb.txt https://raw.githubusercontent.com/mdqinc/SDL_GameControllerDB/master/gamecontrollerdb.txt + codesign --force --deep --sign - --options runtime --entitlements cmake/macos/entitlements.plist $APP mkdir spaghetti-${{ matrix.config }} - mv build-cmake/Spaghettify spaghetti-${{ matrix.config }}/ - mv build-cmake/spaghetti.o2r spaghetti-${{ matrix.config }}/ - mv config.yml spaghetti-${{ matrix.config }}/ - mv yamls spaghetti-${{ matrix.config }}/ - mv meta spaghetti-${{ matrix.config }}/ - wget -O spaghetti-${{ matrix.config }}/gamecontrollerdb.txt https://raw.githubusercontent.com/mdqinc/SDL_GameControllerDB/master/gamecontrollerdb.txt + # Zip with ditto so the executable bit survives artifact upload. + ditto -c -k --keepParent $APP spaghetti-${{ matrix.config }}/SpaghettiKart.app.zip - name: Publish packaged artifacts if: matrix.config == 'Release' uses: actions/upload-artifact@v4 |