From 06cc8b0ed16115dcdb38e2adc65d4a75ecd024a4 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Mon, 11 May 2020 11:22:01 -0300 Subject: one more attempt at hot-fixing installed fdroidserver in CI --- nightly-stats.patch | 8 -------- wallet/.gitlab-ci.yml | 1 + 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/nightly-stats.patch b/nightly-stats.patch index 35e0429..ae80fee 100644 --- a/nightly-stats.patch +++ b/nightly-stats.patch @@ -28,14 +28,6 @@ index 7a90294d..9ad806b3 100644 ssh_private_key_file = _ssh_key_from_debug_keystore() # this is needed for GitPython to find the SSH key -@@ -235,6 +238,7 @@ Last updated: {date}'''.format(repo_git_base=repo_git_base, - config += "archive_name = '%s'\n" % (repo_git_base + ' archive') - config += "archive_url = '%s'\n" % (repo_base + '/archive') - config += "archive_icon = 'icon.png'\n" -+ config += "archive_description = 'Old nightly builds that have been archived.'\n" - config += "archive_older = %i\n" % options.archive_older - config += "servergitmirrors = '%s'\n" % servergitmirror - config += "keystore = '%s'\n" % KEYSTORE_FILE @@ -244,7 +248,7 @@ Last updated: {date}'''.format(repo_git_base=repo_git_base, config += "keydname = '%s'\n" % DISTINGUISHED_NAME config += "make_current_version_link = False\n" diff --git a/wallet/.gitlab-ci.yml b/wallet/.gitlab-ci.yml index d14eaa9..8845aa4 100644 --- a/wallet/.gitlab-ci.yml +++ b/wallet/.gitlab-ci.yml @@ -41,4 +41,5 @@ wallet_deploy_nightly: - apt update && apt install patch - patch -b /usr/lib/python3/dist-packages/fdroidserver/nightly.py nightly-stats.patch # END + - 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