From b69b3499021bd3651be00a5ddd21b808b00198b5 Mon Sep 17 00:00:00 2001 From: Georg Krause Date: Wed, 11 Aug 2021 12:02:31 +0000 Subject: [PATCH] Generate & deploy metadata after build --- .gitlab-ci.yml | 13 +++++++++++-- metadata/template.yml | 20 ++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 metadata/template.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 16f9171..e71dc69 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,7 +12,6 @@ stages: - deploy .gradle-default: - stage: build before_script: - export GRADLE_USER_HOME=$(pwd)/.gradle - chmod +x ./gradlew @@ -26,12 +25,21 @@ stages: - .gradle/ .build: + stage: build + variables: + apk_file: 'app/build/outputs/apk/debug/app-debug.apk' + metadata_file: 'metadata/audio.funkwhale.android.yml' before_script: - git fetch --unshallow --tags + after_script: + - export versionCode=`$ANDROID_HOME/build-tools/30.0.2/aapt dump badging $apk_file | grep versionCode | awk '{print $3}' | sed s/versionCode=//g | sed s/\'//g` + - apt update && apt install gettext-base + - cat metadata/template.yml | envsubst > $metadata_file extends: .gradle-default artifacts: paths: - - app/build/outputs/apk/debug/app-debug.apk + - $apk_file + - $metadata_file test: extends: .gradle-default @@ -81,6 +89,7 @@ deploy-develop: - eval `ssh-agent -s` - ssh-add <(echo "$SSH_PRIVATE_KEY") - scp -o StrictHostKeyChecking=no app/build/outputs/apk/debug/app-debug.apk fdroid@apps.funkwhale.audio:/srv/fdroid/fdroid/develop/repo/audio.funkwhale.ffa.dev-$CI_COMMIT_SHORT_SHA.apk + - scp -o StrictHostKeyChecking=no metadata/audio.funkwhale.android.yml fdroid@apps.funkwhale.audio:/srv/fdroid/fdroid/develop/metatada/audio.funkwhale.ffa.dev.yml - ssh -o StrictHostKeyChecking=no fdroid@apps.funkwhale.audio 'docker run --rm -u $(id -u):$(id -g) -v /srv/fdroid/fdroid/develop:/repo registry.gitlab.com/fdroid/docker-executable-fdroidserver:master update' tags: - shell diff --git a/metadata/template.yml b/metadata/template.yml new file mode 100644 index 0000000..b307656 --- /dev/null +++ b/metadata/template.yml @@ -0,0 +1,20 @@ +Categories: + - Multimedia + - Funkwhale +License: MIT +AuthorName: Funkwhale +WebSite: https://funkwhale.audio +SourceCode: https://dev.funkwhale.audio/funkwhale/funkwhale-android/ +IssueTracker: https://dev.funkwhale.audio/funkwhale/funkwhale-android/-/issues +Translation: https://translate.funkwhale.audio/projects/funkwhale/ffa/ + +Name: Funkwhale (preview) +Summary: This is the official and native Android music player for Funkwhale, native + to both Android (developed in Kotlin) and to Funkwhale (uses its native API instead + of Subsonic). + +AutoUpdateMode: None +UpdateCheckMode: Tags +UpdateCheckData: output-metadata.json|"version_code":.*"(.*)"|output-metadata.json|"versionName":.*\"(.*)\", +CurrentVersion: $versionCode +