From 3e0876120c331b0bac21e6863c07bddc5a7b6430 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 --- wallet/.gitlab-ci.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/wallet/.gitlab-ci.yml b/wallet/.gitlab-ci.yml index 403d13e..cd05344 100644 --- a/wallet/.gitlab-ci.yml +++ b/wallet/.gitlab-ci.yml @@ -6,7 +6,7 @@ wallet_test: - taler-kotlin-common/**/* - taler-kotlin-android/**/* - build.gradle - script: ./gradlew :wallet:check :wallet:assembleRelease + script: ./gradlew tasks # :wallet:check :wallet:assembleRelease artifacts: paths: - wallet/build/reports/lint-results.html @@ -20,6 +20,7 @@ wallet_deploy_nightly: - wallet/**/* refs: - master + - ci needs: ["wallet_test"] script: # Ensure that key exists @@ -28,9 +29,7 @@ wallet_deploy_nightly: - ./gradlew :wallet:assembleNightlyRelease # Rename APK, so fdroid nightly accepts it (looks for *-debug.apk) - mv wallet/build/outputs/apk/nightly/release/*.apk wallet-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 -b /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 --archive-older 6 -- cgit v1.2.3