From ddc802d2b4023324d3d5d1f896417d800034fef5 Mon Sep 17 00:00:00 2001 From: SachinVin Date: Sat, 13 Aug 2022 21:22:15 +0530 Subject: [PATCH] android: add canary and nightly flavours + fix git version tags --- .ci/android/build.sh | 7 +++++-- .ci/android/upload.sh | 7 +++++-- src/android/app/build.gradle | 16 ++++++++++++++++ 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/.ci/android/build.sh b/.ci/android/build.sh index 3c1e2f240..727f855d3 100755 --- a/.ci/android/build.sh +++ b/.ci/android/build.sh @@ -1,12 +1,15 @@ #!/bin/bash -ex export NDK_CCACHE=$(which ccache) +[ "$GITHUB_REPOSITORY" = "citra-emu/citra-canary" ] && + BUILD_FLAVOR=canary || + BUILD_FLAVOR=nightly ccache -s cd src/android chmod +x ./gradlew -./gradlew bundleRelease -./gradlew assembleRelease +./gradlew assemble${BUILD_FLAVOR}Release +./gradlew bundle${BUILD_FLAVOR}Release ccache -s diff --git a/.ci/android/upload.sh b/.ci/android/upload.sh index 64258dfd5..e395e5b4c 100755 --- a/.ci/android/upload.sh +++ b/.ci/android/upload.sh @@ -3,8 +3,11 @@ . ./.ci/common/pre-upload.sh REV_NAME="citra-${GITDATE}-${GITREV}" +[ "${GITHUB_REPOSITORY}" = "citra-emu/citra-canary" ] && + BUILD_FLAVOR=canary || + BUILD_FLAVOR=nightly -cp src/android/app/build/outputs/apk/release/app-release.apk \ +cp src/android/app/build/outputs/apk/${BUILD_FLAVOR}/release/app-${BUILD_FLAVOR}-release.apk \ "artifacts/${REV_NAME}.apk" -cp src/android/app/build/outputs/bundle/release/app-release.aab \ +cp src/android/app/build/outputs/bundle/${BUILD_FLAVOR}Release/app-${BUILD_FLAVOR}-release.aab \ "artifacts/${REV_NAME}.aab" diff --git a/src/android/app/build.gradle b/src/android/app/build.gradle index 1e70d8d99..a3ea30ffb 100644 --- a/src/android/app/build.gradle +++ b/src/android/app/build.gradle @@ -83,6 +83,17 @@ android { } } + flavorDimensions "version" + productFlavors { + canary { + dimension "version" + applicationIdSuffix ".canary" + } + nightly { + dimension "version" + } + } + externalNativeBuild { cmake { version "3.18.1" @@ -140,5 +151,10 @@ def getVersion() { logger.error('Cannot find git, defaulting to dummy version number') } + if (System.getenv("GITHUB_ACTIONS") != null) { + def gitTag = System.getenv("GIT_TAG_NAME") + versionName = gitTag ?: versionName + } + return versionName }