From e1574e2dab58f05571da021752b8431792e2186a Mon Sep 17 00:00:00 2001 From: Marcel Date: Fri, 23 Oct 2020 16:33:06 +0000 Subject: [PATCH] ci(fdroid): Further fdroid deployment fixes --- .gitlab-ci.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3c08604..ace325c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -152,12 +152,10 @@ upload_to_fdroid_repo: - chmod 700 ~/.ssh - ssh-keyscan -t rsa fdroid.nordgedanken.dev >> ~/.ssh/known_hosts script: - - mkdir -p upload - - cp build/android/* upload/ - cd build/android/ - - export UPDATE_VERSION=$(pcregrep -o1 'version:\\s([0-9]*\\.[0-9]*\\.[0-9]*)\\+[0-9]*' pubspec.yaml) && mv app-release.apk "${UPDATE_VERSION}.apk" + - export UPDATE_VERSION=$(pcregrep -o1 'version:\\s([0-9]*\\.[0-9]*\\.[0-9]*)\\+[0-9]*' ../../pubspec.yaml) && mv app-release.apk "${UPDATE_VERSION}.apk" - rsync -rav -e ssh ./ fluffy@fdroid.nordgedanken.dev:/fdroid/repo - - ssh fluffy@fdroid.nordgedanken.dev "cd fdroid && mount binfmt_misc -t binfmt_misc /proc/sys/fs/binfmt_misc && fdroid update" + - ssh fluffy@fdroid.nordgedanken.dev "cd fdroid && fdroid update" needs: ["build_android_apk"] only: - tags