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

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

View file

@ -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

View file

@ -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"