From b53b951230148d6f9f12e398baf74b324b218f6c Mon Sep 17 00:00:00 2001 From: AdamN <7974720+anr2me@users.noreply.github.com> Date: Sun, 22 Jun 2025 18:54:40 +0700 Subject: [PATCH 1/3] Build IPA & DEB using b-ios.sh --- .github/workflows/manual_generate_ipa.yml | 47 +++++++---------------- 1 file changed, 13 insertions(+), 34 deletions(-) diff --git a/.github/workflows/manual_generate_ipa.yml b/.github/workflows/manual_generate_ipa.yml index 370708e724..9ba4e54cf2 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: @@ -46,15 +35,8 @@ jobs: 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,22 +55,19 @@ 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 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 From f832b721a645dfbaf5fe70649fd2cda673967262 Mon Sep 17 00:00:00 2001 From: AdamN <7974720+anr2me@users.noreply.github.com> Date: Sun, 22 Jun 2025 18:59:18 +0700 Subject: [PATCH 2/3] Separate IPA and DEB artifacts --- .github/workflows/manual_generate_ipa.yml | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/manual_generate_ipa.yml b/.github/workflows/manual_generate_ipa.yml index 9ba4e54cf2..95f89da219 100644 --- a/.github/workflows/manual_generate_ipa.yml +++ b/.github/workflows/manual_generate_ipa.yml @@ -30,7 +30,7 @@ jobs: run: | echo "GIT_VERSION=$(git describe --always)" >> $GITHUB_ENV - - name: Create macOS git-version.cpp & Version.txt + - 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 @@ -57,7 +57,7 @@ jobs: export CCACHE_COMPILERCHECK=content ./b-ios.sh - - name: Package build + - name: Prepare artifacts run: | # Testing file location ... find . -name "*.app" @@ -70,8 +70,15 @@ jobs: 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 + From dbd6dd1b78af8c60ced005e1dcf846fa059c8390 Mon Sep 17 00:00:00 2001 From: AdamN <7974720+anr2me@users.noreply.github.com> Date: Sun, 22 Jun 2025 19:13:20 +0700 Subject: [PATCH 3/3] install dependencies --- .github/workflows/manual_generate_ipa.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/manual_generate_ipa.yml b/.github/workflows/manual_generate_ipa.yml index 95f89da219..78d24bfeda 100644 --- a/.github/workflows/manual_generate_ipa.yml +++ b/.github/workflows/manual_generate_ipa.yml @@ -29,7 +29,17 @@ jobs: - name: Set Env Var(s) run: | echo "GIT_VERSION=$(git describe --always)" >> $GITHUB_ENV - + + - 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