diff --git a/.github/workflows/manual_generate_ipa.yml b/.github/workflows/manual_generate_ipa.yml index 370708e724..78d24bfeda 100644 --- a/.github/workflows/manual_generate_ipa.yml +++ b/.github/workflows/manual_generate_ipa.yml @@ -1,21 +1,10 @@ -name: Manual Generate iOS IPA +name: Manual Generate iOS IPA/DEB on: - workflow_dispatch: - inputs: - - buildVariant: - type: choice - description: 'Build Variant' - required: true - default: 'release' - options: - - release - - debug + workflow_dispatch: {} jobs: - - ipa: - name: Generate ${{ github.event.inputs.buildVariant }} IPA + ios: + name: Generate IPA & DEB runs-on: macos-latest steps: @@ -40,21 +29,24 @@ jobs: - name: Set Env Var(s) run: | echo "GIT_VERSION=$(git describe --always)" >> $GITHUB_ENV - - - name: Create macOS git-version.cpp & Version.txt + + - name: Install iOS dependencies + run: | + brew install ldid dpkg pillow + # Check Xcode version + xcodebuild -version + # List available Xcode versions + ls /Applications | grep Xcode + # Select a specific Xcode version. The recommended Xcode version is 9.4.1 according to https://github.com/Halo-Michael/ppsspp-builder + #sudo xcode-select -s /Applications/Xcode_15.2.app/Contents/Developer + + - name: Create 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_NAME] = ${GITHUB_REF_NAME}" - echo "count=${{steps.valid-tags.outputs.count}}" - echo $(echo $GIT_VERSION | cut -c 2-) - # Testing file location ... - find . -name "Version.txt" + mkdir -p build-ios/PPSSPP.app + echo ${GIT_VERSION#v} > build-ios/PPSSPP.app/Version.txt - name: Setup ccache uses: hendrikmuhs/ccache-action@63069e3931dedbf3b63792097479563182fe70d1 # v1.2.18 @@ -73,26 +65,30 @@ jobs: export CCACHE_FILECLONE=true export CCACHE_DEPEND=true export CCACHE_COMPILERCHECK=content - ./b.sh --ios --${{ github.event.inputs.buildVariant }} + ./b-ios.sh - - name: Package build + - name: Prepare artifacts 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. - pushd ppsspp - zip -qry PPSSPP.ipa Payload - rm -rf Payload - popd + if [ -e build-ios/PPSSPP.app ]; then + # Get the final files generated by b-ios.h script + find build -name 'PPSSPP*.ipa' -exec cp -a '{}' ppsspp/ \; + find build -name 'PPSSPP*.xcarchive' -exec cp -a '{}' ppsspp/ \; + find build -name 'PPSSPP*.deb' -exec cp -a '{}' ppsspp/ \; + find build -name 'org.ppsspp*.deb' -exec cp -a '{}' ppsspp/ \; fi - - name: Upload artifact + - name: Upload IPA artifact uses: actions/upload-artifact@v4 with: - name: iOS-${{ github.event.inputs.buildVariant }} build - path: ppsspp/ + name: iOS-IPA build + path: ppsspp/*.ipa + + - name: Upload DEB artifact + uses: actions/upload-artifact@v4 + with: + name: iOS-DEB build + path: ppsspp/*.deb +