diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2023-12-30 20:59:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-30 20:59:04 +0100 |
| commit | ace74bd06623d80af20acd2f0d812ef5ccabfb7d (patch) | |
| tree | 229144f8f06bf84ed20da79c08ae5f1a8da4b3c5 | |
| parent | Merge pull request #12527 from DCNick3/log-more-sdl-errors (diff) | |
| parent | actions: android: Build relWithDebInfo on main repo (diff) | |
| download | yuzu-ace74bd06623d80af20acd2f0d812ef5ccabfb7d.tar yuzu-ace74bd06623d80af20acd2f0d812ef5ccabfb7d.tar.gz yuzu-ace74bd06623d80af20acd2f0d812ef5ccabfb7d.tar.bz2 yuzu-ace74bd06623d80af20acd2f0d812ef5ccabfb7d.tar.lz yuzu-ace74bd06623d80af20acd2f0d812ef5ccabfb7d.tar.xz yuzu-ace74bd06623d80af20acd2f0d812ef5ccabfb7d.tar.zst yuzu-ace74bd06623d80af20acd2f0d812ef5ccabfb7d.zip | |
| -rwxr-xr-x | .ci/scripts/android/build.sh | 9 | ||||
| -rwxr-xr-x | .ci/scripts/android/upload.sh | 13 |
2 files changed, 17 insertions, 5 deletions
diff --git a/.ci/scripts/android/build.sh b/.ci/scripts/android/build.sh index d135af029..98593017f 100755 --- a/.ci/scripts/android/build.sh +++ b/.ci/scripts/android/build.sh @@ -6,7 +6,12 @@ export NDK_CCACHE="$(which ccache)" ccache -s -BUILD_FLAVOR=mainline +BUILD_FLAVOR="mainline" + +BUILD_TYPE="release" +if [ "${GITHUB_REPOSITORY}" == "yuzu-emu/yuzu" ]; then + BUILD_TYPE="relWithDebInfo" +fi if [ ! -z "${ANDROID_KEYSTORE_B64}" ]; then export ANDROID_KEYSTORE_FILE="${GITHUB_WORKSPACE}/ks.jks" @@ -15,7 +20,7 @@ fi cd src/android chmod +x ./gradlew -./gradlew "assemble${BUILD_FLAVOR}Release" "bundle${BUILD_FLAVOR}Release" +./gradlew "assemble${BUILD_FLAVOR}${BUILD_TYPE}" "bundle${BUILD_FLAVOR}${BUILD_TYPE}" ccache -s diff --git a/.ci/scripts/android/upload.sh b/.ci/scripts/android/upload.sh index 5f8ca73c0..26b1a7efa 100755 --- a/.ci/scripts/android/upload.sh +++ b/.ci/scripts/android/upload.sh @@ -7,9 +7,16 @@ REV_NAME="yuzu-${GITDATE}-${GITREV}" -BUILD_FLAVOR=mainline +BUILD_FLAVOR="mainline" -cp src/android/app/build/outputs/apk/"${BUILD_FLAVOR}/release/app-${BUILD_FLAVOR}-release.apk" \ +BUILD_TYPE_LOWER="release" +BUILD_TYPE_UPPER="Release" +if [ "${GITHUB_REPOSITORY}" == "yuzu-emu/yuzu" ]; then + BUILD_TYPE_LOWER="relWithDebInfo" + BUILD_TYPE_UPPER="RelWithDebInfo" +fi + +cp src/android/app/build/outputs/apk/"${BUILD_FLAVOR}/${BUILD_TYPE_LOWER}/app-${BUILD_FLAVOR}-${BUILD_TYPE_LOWER}.apk" \ "artifacts/${REV_NAME}.apk" -cp src/android/app/build/outputs/bundle/"${BUILD_FLAVOR}Release"/"app-${BUILD_FLAVOR}-release.aab" \ +cp src/android/app/build/outputs/bundle/"${BUILD_FLAVOR}${BUILD_TYPE_UPPER}"/"app-${BUILD_FLAVOR}-${BUILD_TYPE_LOWER}.aab" \ "artifacts/${REV_NAME}.aab" |