From eb831226ef4442c4a33d08f2447adda8ae88dd79 Mon Sep 17 00:00:00 2001 From: AdamN <7974720+anr2me@users.noreply.github.com> Date: Thu, 21 Mar 2024 16:52:45 +0700 Subject: [PATCH 1/6] Update manual_generate_apk.yml Added VR variants and more detailed logs --- .github/workflows/manual_generate_apk.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/manual_generate_apk.yml b/.github/workflows/manual_generate_apk.yml index 25f942bff206..3111dde3d470 100644 --- a/.github/workflows/manual_generate_apk.yml +++ b/.github/workflows/manual_generate_apk.yml @@ -11,6 +11,8 @@ on: options: - NormalOptimized - NormalDebug + - VrDebug + - VrOptimized jobs: @@ -39,7 +41,7 @@ jobs: # ndk-version: r21e - name: Assemble APK - run: bash ./gradlew assemble${{ github.event.inputs.buildVariant }} --stacktrace + run: bash ./gradlew assemble${{ github.event.inputs.buildVariant }} --stacktrace --debug --scan #- name: Gradle Test # run: bash ./gradlew test${{ github.event.inputs.buildVariant }}UnitTest --stacktrace @@ -48,10 +50,8 @@ jobs: run: | find . -name "*.apk" mkdir ppsspp - if [ -e android/build/*/apk/*/*/android-normal-optimized.apk ]; then - cp android/build/*/apk/*/*/android-normal-optimized.apk ppsspp/ - elif [ -e android/build/*/apk/*/*/android-normal-debug.apk ]; then - cp android/build/*/apk/*/*/android-normal-debug.apk ppsspp/ + if [ -e android/build/*/apk/*/*/*.apk ]; then + cp android/build/*/apk/*/*/*.apk ppsspp/ fi - name: Upload artifact From a23a42959a14f6135289e8c52106a077b7bd4325 Mon Sep 17 00:00:00 2001 From: AdamN <7974720+anr2me@users.noreply.github.com> Date: Thu, 21 Mar 2024 17:21:06 +0700 Subject: [PATCH 2/6] using --info as --debug seems to be too much --- .github/workflows/manual_generate_apk.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/manual_generate_apk.yml b/.github/workflows/manual_generate_apk.yml index 3111dde3d470..bd3817aaf244 100644 --- a/.github/workflows/manual_generate_apk.yml +++ b/.github/workflows/manual_generate_apk.yml @@ -41,7 +41,7 @@ jobs: # ndk-version: r21e - name: Assemble APK - run: bash ./gradlew assemble${{ github.event.inputs.buildVariant }} --stacktrace --debug --scan + run: bash ./gradlew assemble${{ github.event.inputs.buildVariant }} --stacktrace --info --scan #- name: Gradle Test # run: bash ./gradlew test${{ github.event.inputs.buildVariant }}UnitTest --stacktrace From 08419f5e08a96695594d6ada414f84373dac2f22 Mon Sep 17 00:00:00 2001 From: AdamN <7974720+anr2me@users.noreply.github.com> Date: Thu, 21 Mar 2024 17:45:42 +0700 Subject: [PATCH 3/6] no need build scan since the logs is already public --- .github/workflows/manual_generate_apk.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/manual_generate_apk.yml b/.github/workflows/manual_generate_apk.yml index bd3817aaf244..83e105319c3d 100644 --- a/.github/workflows/manual_generate_apk.yml +++ b/.github/workflows/manual_generate_apk.yml @@ -41,7 +41,7 @@ jobs: # ndk-version: r21e - name: Assemble APK - run: bash ./gradlew assemble${{ github.event.inputs.buildVariant }} --stacktrace --info --scan + run: bash ./gradlew assemble${{ github.event.inputs.buildVariant }} --stacktrace --info #- name: Gradle Test # run: bash ./gradlew test${{ github.event.inputs.buildVariant }}UnitTest --stacktrace From e6aa4fc013acc914248b80deeb260f0fa75c5799 Mon Sep 17 00:00:00 2001 From: AdamN <7974720+anr2me@users.noreply.github.com> Date: Mon, 25 Mar 2024 04:59:25 +0700 Subject: [PATCH 4/6] cache gradle on JDK --- .github/workflows/manual_generate_apk.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/manual_generate_apk.yml b/.github/workflows/manual_generate_apk.yml index 83e105319c3d..f5cd03d39591 100644 --- a/.github/workflows/manual_generate_apk.yml +++ b/.github/workflows/manual_generate_apk.yml @@ -31,6 +31,7 @@ jobs: with: distribution: 'zulu' java-version: '17' + cache: gradle #- name: Setup SDK # uses: android-actions/setup-android@v2 From 73fca425add08aa56f40baf8182629d25cd928b1 Mon Sep 17 00:00:00 2001 From: AdamN <7974720+anr2me@users.noreply.github.com> Date: Mon, 25 Mar 2024 05:05:01 +0700 Subject: [PATCH 5/6] create a dummy tag for androidGitVersion to work on a new fork --- .github/workflows/manual_generate_apk.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/manual_generate_apk.yml b/.github/workflows/manual_generate_apk.yml index f5cd03d39591..62d396aa5289 100644 --- a/.github/workflows/manual_generate_apk.yml +++ b/.github/workflows/manual_generate_apk.yml @@ -25,6 +25,11 @@ jobs: with: fetch-depth: 0 submodules: recursive + + - name: Create a dummy tag (androidGitVersion need at least one tag to exist) + run: | + git tag dummy + ./gradle --quiet androidGitVersion - name: Setup JDK uses: actions/setup-java@v2 From 5d238add3905f4b7cff745c5af0287570452ec0e Mon Sep 17 00:00:00 2001 From: AdamN <7974720+anr2me@users.noreply.github.com> Date: Mon, 25 Mar 2024 05:11:11 +0700 Subject: [PATCH 6/6] test androidGitVersion --- .github/workflows/manual_generate_apk.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/manual_generate_apk.yml b/.github/workflows/manual_generate_apk.yml index 62d396aa5289..b2a0416c1627 100644 --- a/.github/workflows/manual_generate_apk.yml +++ b/.github/workflows/manual_generate_apk.yml @@ -27,9 +27,7 @@ jobs: submodules: recursive - name: Create a dummy tag (androidGitVersion need at least one tag to exist) - run: | - git tag dummy - ./gradle --quiet androidGitVersion + run: git tag dummy - name: Setup JDK uses: actions/setup-java@v2 @@ -45,6 +43,9 @@ jobs: # uses: nttld/setup-ndk@v1 # with: # ndk-version: r21e + + - name: Test androidGitVersion + run: gradle --quiet androidGitVersion - name: Assemble APK run: bash ./gradlew assemble${{ github.event.inputs.buildVariant }} --stacktrace --info