summaryrefslogtreecommitdiff
path: root/merchant-terminal
diff options
context:
space:
mode:
authorTorsten Grote <t@grobox.de>2021-12-21 11:59:32 -0300
committerTorsten Grote <t@grobox.de>2021-12-21 14:19:06 -0300
commit39482a5e72006cc64fc5b62286b312c029b1d8aa (patch)
tree54be26142f2d8e63d1777424979f5a6876d26843 /merchant-terminal
parent296586ede77806feefb11e826fb3ca8a304b9218 (diff)
downloadtaler-android-39482a5e72006cc64fc5b62286b312c029b1d8aa.tar.gz
taler-android-39482a5e72006cc64fc5b62286b312c029b1d8aa.tar.bz2
taler-android-39482a5e72006cc64fc5b62286b312c029b1d8aa.zip
Remove nightly patch for fdroidserver
Diffstat (limited to 'merchant-terminal')
-rw-r--r--merchant-terminal/.gitlab-ci.yml7
1 files changed, 3 insertions, 4 deletions
diff --git a/merchant-terminal/.gitlab-ci.yml b/merchant-terminal/.gitlab-ci.yml
index 63b58f1..79e5874 100644
--- a/merchant-terminal/.gitlab-ci.yml
+++ b/merchant-terminal/.gitlab-ci.yml
@@ -42,8 +42,7 @@ 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 fdroidserver and patch not accepted/released upstream
- - apt update && apt-get -qy install --no-install-recommends fdroidserver openssh-client 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
+ - fdroid --version
- CI_PROJECT_URL="https://gitlab.com/gnu-taler/fdroid-repo" CI_PROJECT_PATH="gnu-taler/fdroid-repo" fdroid nightly -v