diff options
-rw-r--r-- | cashier/.gitlab-ci.yml | 7 | ||||
-rw-r--r-- | merchant-terminal/.gitlab-ci.yml | 7 | ||||
-rw-r--r-- | nightly-stats.patch | 38 | ||||
-rw-r--r-- | wallet/.gitlab-ci.yml | 6 |
4 files changed, 8 insertions, 50 deletions
diff --git a/cashier/.gitlab-ci.yml b/cashier/.gitlab-ci.yml index 57c9971..596f453 100644 --- a/cashier/.gitlab-ci.yml +++ b/cashier/.gitlab-ci.yml @@ -39,8 +39,7 @@ cashier_deploy_nightly: - ./gradlew :cashier:assembleRelease # Rename APK, so fdroid nightly accepts it (looks for *-debug.apk) - mv cashier/build/outputs/apk/release/*.apk cashier-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 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 diff --git a/nightly-stats.patch b/nightly-stats.patch deleted file mode 100644 index 46c0f2c..0000000 --- a/nightly-stats.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/fdroidserver/nightly.py b/fdroidserver/nightly.py -index 7a90294d..9ad806b3 100644 ---- a/fdroidserver/nightly.py -+++ b/fdroidserver/nightly.py -@@ -170,6 +170,7 @@ def main(): - git_mirror_path = os.path.join(repo_basedir, 'git-mirror') - git_mirror_repodir = os.path.join(git_mirror_path, 'fdroid', 'repo') - git_mirror_metadatadir = os.path.join(git_mirror_path, 'fdroid', 'metadata') -+ git_mirror_statsdir = os.path.join(git_mirror_path, 'fdroid', 'stats') - if not os.path.isdir(git_mirror_repodir): - logging.debug(_('cloning {url}').format(url=clone_url)) - try: -@@ -217,6 +218,8 @@ Last updated: {date}'''.format(repo_git_base=repo_git_base, - common.local_rsync(options, git_mirror_repodir + '/', 'repo/') - if os.path.isdir(git_mirror_metadatadir): - common.local_rsync(options, git_mirror_metadatadir + '/', 'metadata/') -+ if os.path.isdir(git_mirror_statsdir): -+ common.local_rsync(options, git_mirror_statsdir + '/', 'stats/') - - ssh_private_key_file = _ssh_key_from_debug_keystore() - # this is needed for GitPython to find the SSH key -@@ -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" - config += "accepted_formats = ('txt', 'yml')\n" -- # TODO add update_stats = True -+ config += "update_stats = True\n" - with open('config.py', 'w') as fp: - fp.write(config) - os.chmod('config.py', 0o600) -@@ -291,6 +295,7 @@ Last updated: {date}'''.format(repo_git_base=repo_git_base, - subprocess.check_call(['fdroid', 'update', '--rename-apks', '--create-metadata', '--verbose'], - cwd=repo_basedir) - common.local_rsync(options, repo_basedir + '/metadata/', git_mirror_metadatadir + '/') -+ common.local_rsync(options, repo_basedir + '/stats/', git_mirror_statsdir + '/') - mirror_git_repo.git.add(all=True) - mirror_git_repo.index.commit("update app metadata") - diff --git a/wallet/.gitlab-ci.yml b/wallet/.gitlab-ci.yml index 403d13e..405b582 100644 --- a/wallet/.gitlab-ci.yml +++ b/wallet/.gitlab-ci.yml @@ -28,9 +28,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 |