diff options
| author | Isaac Marovitz <42140194+IsaacMarovitz@users.noreply.github.com> | 2023-05-12 23:53:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-13 00:53:52 +0200 |
| commit | c2709b3bddf94e61eaacfa1271494d16e5412b26 (patch) | |
| tree | 96d6fe3915256f646f75d5a099584cb639c908a5 | |
| parent | 2b6e81deea47c1546e44fdcb8702a7c667056fde (diff) | |
macOS CI Adjustments (#4910)1.1.795
* Fix macOS build name in CI
Fixes updater
* Update build.yml
Don't publish x86 Mac builds
* Naming nitpick
* Berry changes
* Use the same prefix for PR and release build archives
---------
Co-authored-by: TSR Berry <20988865+TSRBerry@users.noreply.github.com>
| -rw-r--r-- | .github/workflows/build.yml | 18 | ||||
| -rwxr-xr-x | distribution/macos/create_macos_build.sh | 4 |
2 files changed, 11 insertions, 11 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8bc55ec3..54389e55 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,7 +38,7 @@ jobs: RELEASE_ZIP_OS_NAME: linux_x64 - os: macOS-latest - OS_NAME: MacOS x64 + OS_NAME: macOS x64 DOTNET_RUNTIME_IDENTIFIER: osx-x64 RELEASE_ZIP_OS_NAME: osx_x64 @@ -68,15 +68,15 @@ jobs: - name: Publish Ryujinx run: dotnet publish -c "${{ matrix.configuration }}" -r "${{ matrix.DOTNET_RUNTIME_IDENTIFIER }}" -o ./publish -p:Version="${{ env.RYUJINX_BASE_VERSION }}" -p:DebugType=embedded -p:SourceRevisionId="${{ steps.git_short_hash.outputs.result }}" -p:ExtraDefineConstants=DISABLE_UPDATER src/Ryujinx --self-contained true - if: github.event_name == 'pull_request' + if: github.event_name == 'pull_request' && matrix.os != 'macOS-latest' - name: Publish Ryujinx.Headless.SDL2 run: dotnet publish -c "${{ matrix.configuration }}" -r "${{ matrix.DOTNET_RUNTIME_IDENTIFIER }}" -o ./publish_sdl2_headless -p:Version="${{ env.RYUJINX_BASE_VERSION }}" -p:DebugType=embedded -p:SourceRevisionId="${{ steps.git_short_hash.outputs.result }}" -p:ExtraDefineConstants=DISABLE_UPDATER src/Ryujinx.Headless.SDL2 --self-contained true - if: github.event_name == 'pull_request' + if: github.event_name == 'pull_request' && matrix.os != 'macOS-latest' - name: Publish Ryujinx.Ava run: dotnet publish -c "${{ matrix.configuration }}" -r "${{ matrix.DOTNET_RUNTIME_IDENTIFIER }}" -o ./publish_ava -p:Version="${{ env.RYUJINX_BASE_VERSION }}" -p:DebugType=embedded -p:SourceRevisionId="${{ steps.git_short_hash.outputs.result }}" -p:ExtraDefineConstants=DISABLE_UPDATER src/Ryujinx.Ava --self-contained true - if: github.event_name == 'pull_request' + if: github.event_name == 'pull_request' && matrix.os != 'macOS-latest' - name: Set executable bit run: | @@ -90,24 +90,24 @@ jobs: with: name: ryujinx-${{ matrix.configuration }}-${{ env.RYUJINX_BASE_VERSION }}+${{ steps.git_short_hash.outputs.result }}-${{ matrix.RELEASE_ZIP_OS_NAME }} path: publish - if: github.event_name == 'pull_request' + if: github.event_name == 'pull_request' && matrix.os != 'macOS-latest' - name: Upload Ryujinx.Headless.SDL2 artifact uses: actions/upload-artifact@v3 with: name: sdl2-ryujinx-headless-${{ matrix.configuration }}-${{ env.RYUJINX_BASE_VERSION }}+${{ steps.git_short_hash.outputs.result }}-${{ matrix.RELEASE_ZIP_OS_NAME }} path: publish_sdl2_headless - if: github.event_name == 'pull_request' + if: github.event_name == 'pull_request' && matrix.os != 'macOS-latest' - name: Upload Ryujinx.Ava artifact uses: actions/upload-artifact@v3 with: name: ava-ryujinx-${{ matrix.configuration }}-${{ env.RYUJINX_BASE_VERSION }}+${{ steps.git_short_hash.outputs.result }}-${{ matrix.RELEASE_ZIP_OS_NAME }} path: publish_ava - if: github.event_name == 'pull_request' + if: github.event_name == 'pull_request' && matrix.os != 'macOS-latest' build_macos: - name: MacOS universal (${{ matrix.configuration }}) + name: macOS Universal (${{ matrix.configuration }}) runs-on: ubuntu-latest strategy: matrix: @@ -150,4 +150,4 @@ jobs: with: name: ava-ryujinx-${{ matrix.configuration }}-${{ env.RYUJINX_BASE_VERSION }}+${{ steps.git_short_hash.outputs.result }}-macos_universal path: "publish_ava/*.tar.gz" - if: github.event_name == 'pull_request'
\ No newline at end of file + if: github.event_name == 'pull_request' diff --git a/distribution/macos/create_macos_build.sh b/distribution/macos/create_macos_build.sh index 1a5a3873..7405073d 100755 --- a/distribution/macos/create_macos_build.sh +++ b/distribution/macos/create_macos_build.sh @@ -22,9 +22,9 @@ EXTRA_ARGS=$8 if [ "$VERSION" == "1.1.0" ]; then - RELEASE_TAR_FILE_NAME=Ryujinx-$CONFIGURATION-$VERSION+$SOURCE_REVISION_ID-macos_universal.app.tar + RELEASE_TAR_FILE_NAME=test-ava-ryujinx-$CONFIGURATION-$VERSION+$SOURCE_REVISION_ID-macos_universal.app.tar else - RELEASE_TAR_FILE_NAME=Ryujinx-$VERSION-macos_universal.app.tar + RELEASE_TAR_FILE_NAME=test-ava-ryujinx-$VERSION-macos_universal.app.tar fi ARM64_APP_BUNDLE="$TEMP_DIRECTORY/output_arm64/Ryujinx.app" |