summaryrefslogtreecommitdiff
path: root/merchant-terminal/.gitlab-ci.yml
diff options
context:
space:
mode:
Diffstat (limited to 'merchant-terminal/.gitlab-ci.yml')
-rw-r--r--merchant-terminal/.gitlab-ci.yml9
1 files changed, 5 insertions, 4 deletions
diff --git a/merchant-terminal/.gitlab-ci.yml b/merchant-terminal/.gitlab-ci.yml
index 023b7bf..b756a37 100644
--- a/merchant-terminal/.gitlab-ci.yml
+++ b/merchant-terminal/.gitlab-ci.yml
@@ -42,8 +42,9 @@ merchant_deploy_nightly:
- ./gradlew :merchant-terminal:assembleRelease
# Rename APK, so fdroid nightly accepts it (looks for *-debug.apk)
- mv merchant-terminal/build/outputs/apk/release/*.apk merchant-terminal-debug.apk
- # START only needed while patch not accepted/released upstream
- - apt update && apt install patch
- - patch /usr/lib/python3/dist-packages/fdroidserver/nightly.py nightly-stats.patch
- # END
+ # install fdroidserver and dependencies for nightly publishing
+ - apt update && apt-get -qy install --no-install-recommends fdroidserver openssh-client
+ # backport fix from https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1078
+ - sed -e '/common.apk_strip_v1_signatures/ s/^#*/#/' -i /usr/lib/python3/dist-packages/fdroidserver/nightly.py
+ - fdroid --version
- CI_PROJECT_URL="https://gitlab.com/gnu-taler/fdroid-repo" CI_PROJECT_PATH="gnu-taler/fdroid-repo" fdroid nightly -v