Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'hrydgard:master' into master
- Loading branch information
Showing
363 changed files
with
7,820 additions
and
3,595 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| name: Manual Generate iOS IPA | ||
| on: | ||
| workflow_dispatch: | ||
| inputs: | ||
|
|
||
| buildVariant: | ||
| type: choice | ||
| description: 'Build Variant' | ||
| required: true | ||
| default: 'release' | ||
| options: | ||
| - release | ||
| - debug | ||
|
|
||
| jobs: | ||
|
|
||
| ipa: | ||
| name: Generate ${{ github.event.inputs.buildVariant }} IPA | ||
| runs-on: macos-latest | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| with: | ||
| fetch-depth: 0 | ||
| submodules: recursive | ||
|
|
||
| #- name: Fetch tags for macOS | ||
| # # This is required for git describe --always to work for git-version.cpp. | ||
| # run: | | ||
| # git fetch --deepen=15000 --no-recurse-submodules --tags || exit 0 | ||
|
|
||
| - name: Set Env Var(s) | ||
| run: | | ||
| echo "GIT_VERSION=$(git describe --always)" >> $GITHUB_ENV | ||
| - name: Create macOS git-version.cpp & Version.txt | ||
| run: | | ||
| echo "const char *PPSSPP_GIT_VERSION = \"${GIT_VERSION}\";" > git-version.cpp | ||
| echo "#define PPSSPP_GIT_VERSION_NO_UPDATE 1" >> git-version.cpp | ||
| # Create Version.txt file (should probably do this during building process) | ||
| mkdir build-ios | ||
| mkdir build-ios/PPSSPP.app | ||
| echo $(echo $GIT_VERSION | cut -c 2-) > build-ios/PPSSPP.app/Version.txt | ||
| # Testing values ... | ||
| echo "Content of [GITHUB_REF##*/] = ${GITHUB_REF##*/}" | ||
| echo $(echo $GIT_VERSION | cut -c 2-) | ||
| # Testing file location ... | ||
| find . -name "Version.txt" | ||
| - name: Setup ccache | ||
| uses: hendrikmuhs/ccache-action@main | ||
| with: | ||
| key: ios | ||
| create-symlink: true | ||
|
|
||
| - name: Execute build | ||
| env: | ||
| CC: clang | ||
| CXX: clang++ | ||
| run: | | ||
| export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH" | ||
| ./b.sh --ios --${{ github.event.inputs.buildVariant }} | ||
| - name: Package build | ||
| run: | | ||
| # Testing file location ... | ||
| find . -name "Version.txt" | ||
| find . -name "*.app" | ||
| mkdir ppsspp | ||
| if [ -e build*/PPSSPP.app ]; then | ||
| mkdir ppsspp/Payload | ||
| cp -a build*/PPSSPP.app ppsspp/Payload | ||
| # GitHub Actions zipping kills symlinks and permissions. | ||
| cd ppsspp | ||
| zip -qry PPSSPP.ipa Payload | ||
| rm -rf Payload | ||
| cd - | ||
| fi | ||
| - name: Upload artifact | ||
| uses: actions/upload-artifact@v3 | ||
| with: | ||
| name: iOS-${{ github.event.inputs.buildVariant }} build | ||
| path: ppsspp/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| name: Manual Generate UWP MSIX/MSIXBundle | ||
| on: | ||
| workflow_dispatch: | ||
| inputs: | ||
|
|
||
| buildConfiguration: | ||
| type: choice | ||
| description: 'Build Configuration' | ||
| required: true | ||
| default: 'Release' | ||
| options: | ||
| - Release | ||
| - Debug | ||
|
|
||
| buildPlatform: | ||
| type: choice | ||
| description: 'Build Platform' | ||
| required: true | ||
| default: 'Bundle' | ||
| options: | ||
| - Bundle | ||
| - x64 | ||
| - ARM64 | ||
| - ARM | ||
|
|
||
| jobs: | ||
|
|
||
| build-uwp: | ||
| name: Generate ${{ github.event.inputs.buildConfiguration }} ${{ github.event.inputs.buildPlatform }} UWP | ||
| runs-on: windows-latest | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| with: | ||
| fetch-depth: 0 | ||
| submodules: recursive | ||
|
|
||
| - name: Add MSBuild to PATH | ||
| uses: microsoft/setup-msbuild@v1.1 | ||
|
|
||
| #- name: Setup cache # We probably need something like MSBuildCache for MSBuild to be able to use cache properly | ||
| # id: cache-uwp | ||
| # uses: actions/cache@v3 | ||
| # with: | ||
| # path: | | ||
| # UWP/${{ github.event.inputs.buildPlatform }}/${{ github.event.inputs.buildConfiguration }}/** | ||
| # key: uwp-${{ github.event.inputs.buildConfiguration }}-${{ github.event.inputs.buildPlatform }} | ||
|
|
||
| - name: Testing values | ||
| run: | | ||
| # Testing values ... | ||
| #env | ||
| echo "Content of [env.GITHUB_WORKSPACE] = ${env.GITHUB_WORKSPACE}" | ||
| echo "Content of [[env.GITHUB_WORKSPACE]] = ${{env.GITHUB_WORKSPACE}}" | ||
| echo "Content of [env:GITHUB_WORKSPACE] = ${env:GITHUB_WORKSPACE}" | ||
| echo "Content of [github.workspace] = ${github.workspace}" | ||
| echo "Content of [[github.workspace]] = ${{github.workspace}}" | ||
| echo "double ${{ github.event.inputs.buildConfiguration }}" | ||
| echo ${{github.workspace}} | ||
| echo "single ${ github.event.inputs.buildConfiguration }" | ||
| echo $env:GITHUB_WORKSPACE | ||
| - name: Execute MSIX build | ||
| working-directory: ${{ github.workspace }} | ||
| env: | ||
| INCLUDE_SYMBOLS: ${{ github.event.inputs.buildConfiguration == 'Debug' && 'true' || 'false' }} | ||
| if: ${{ github.event.inputs.buildPlatform != 'Bundle' }} | ||
| run: | | ||
| echo "include symbols = ${{ env.INCLUDE_SYMBOLS }}" | ||
| msbuild UWP/PPSSPP_UWP.sln /m /p:TrackFileAccess=false /p:Configuration=${{ github.event.inputs.buildConfiguration }} /p:Platform=${{ github.event.inputs.buildPlatform }} /p:IncludeSymbols=${{ env.INCLUDE_SYMBOLS }} /p:AppxSymbolPackageEnabled=${{ env.INCLUDE_SYMBOLS }} /p:AppxPackageSigningEnabled=true /p:PackageCertificateKeyFile=PPSSPP_UWP_TemporaryKey.pfx /p:AppxBundle=Never /p:UapAppxPackageBuildMode=SideloadOnly /p:AppxBundlePlatforms="${{ github.event.inputs.buildPlatform }}" | ||
| - name: Execute MSIXBundle build | ||
| working-directory: ${{ github.workspace }} | ||
| env: | ||
| INCLUDE_SYMBOLS: ${{ github.event.inputs.buildConfiguration == 'Debug' && 'true' || 'false' }} | ||
| if: ${{ github.event.inputs.buildPlatform == 'Bundle' }} | ||
| run: | | ||
| echo "include symbols = ${{ env.INCLUDE_SYMBOLS }}" | ||
| msbuild UWP/PPSSPP_UWP.sln /m /p:TrackFileAccess=false /p:Configuration=${{ github.event.inputs.buildConfiguration }} /p:Platform=x64 /p:IncludeSymbols=${{ env.INCLUDE_SYMBOLS }} /p:AppxSymbolPackageEnabled=${{ env.INCLUDE_SYMBOLS }} /p:AppxPackageSigningEnabled=true /p:PackageCertificateKeyFile=PPSSPP_UWP_TemporaryKey.pfx /p:AppxBundle=Always /p:UapAppxPackageBuildMode=SideloadOnly /p:AppxBundlePlatforms="x64|ARM64|ARM" | ||
| - name: Package build | ||
| working-directory: ${{ github.workspace }} | ||
| run: | | ||
| # Testing file location ... | ||
| #find . -name "PPSSPP*.exe" | ||
| #find . -name "*.appx*" | ||
| #find . -name "*.msix*" | ||
| mkdir ppsspp | ||
| #ls UWP/AppPackages/PPSSPP_UWP | ||
| cp -r UWP/AppPackages/PPSSPP_UWP/*.* ppsspp/ | ||
| #ls ppsspp | ||
| - name: Upload artifact | ||
| uses: actions/upload-artifact@v3 | ||
| with: | ||
| name: UWP-${{ github.event.inputs.buildConfiguration }}-${{ github.event.inputs.buildPlatform }} build | ||
| path: ppsspp/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.