From 39482a5e72006cc64fc5b62286b312c029b1d8aa Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Tue, 21 Dec 2021 11:59:32 -0300 Subject: Remove nightly patch for fdroidserver --- merchant-terminal/.gitlab-ci.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'merchant-terminal') 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 -- cgit v1.2.3