mirrors/citra
1
0
Fork 0
Code Issues Pull requests Releases Activity

android: add canary and nightly flavours + fix git version tags

Browse source
This commit is contained in:
SachinVin 2022-08-13 21:22:15 +05:30
parent 141471e38f
commit ddc802d2b4
3 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.ci/android/build.sh
View file

@ -1,12 +1,15 @@
#!/bin/bash -ex #!/bin/bash -ex
export NDK_CCACHE=$(which ccache) export NDK_CCACHE=$(which ccache)
[ "$GITHUB_REPOSITORY" = "citra-emu/citra-canary" ] &&
BUILD_FLAVOR=canary ||
BUILD_FLAVOR=nightly
ccache -s ccache -s
cd src/android cd src/android
chmod +x ./gradlew chmod +x ./gradlew
./gradlew bundleRelease ./gradlew assemble${BUILD_FLAVOR}Release
./gradlew assembleRelease ./gradlew bundle${BUILD_FLAVOR}Release
ccache -s ccache -s

7
.ci/android/upload.sh
View file

@ -3,8 +3,11 @@
. ./.ci/common/pre-upload.sh . ./.ci/common/pre-upload.sh
REV_NAME="citra-${GITDATE}-${GITREV}" 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" "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" "artifacts/${REV_NAME}.aab"

16
src/android/app/build.gradle
View file

@ -83,6 +83,17 @@ android {
} }
} }
flavorDimensions "version"
productFlavors {
canary {
dimension "version"
applicationIdSuffix ".canary"
}
nightly {
dimension "version"
}
}
externalNativeBuild { externalNativeBuild {
cmake { cmake {
version "3.18.1" version "3.18.1"
@ -140,5 +151,10 @@ def getVersion() {
logger.error('Cannot find git, defaulting to dummy version number') 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 return versionName
} }