From 7e8c244473d2a163a12719efd8ab55f6230acee9 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 16 Jun 2020 14:33:07 +0200 Subject: [PATCH 1/2] provision-apt-get-install: ensure gpg is installed The basebox installs gpg, but when this script is used to provision a GitLab CI Runner, gpg was missing. It is used in some builds. --- buildserver/provision-apt-get-install | 1 + 1 file changed, 1 insertion(+) diff --git a/buildserver/provision-apt-get-install b/buildserver/provision-apt-get-install index 7123b8a6..d4481b32 100644 --- a/buildserver/provision-apt-get-install +++ b/buildserver/provision-apt-get-install @@ -71,6 +71,7 @@ packages=" git-core git-svn gperf + gpg javacc libarchive-zip-perl libexpat1-dev From 1e6f99988a585eeb3237142eb99c543b52039925 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 24 Jun 2020 20:54:42 +0200 Subject: [PATCH 2/2] fix typo when looking for build.gradle.kts --- fdroidserver/common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 48ebe899..04a17fd3 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -2038,7 +2038,7 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver= build_gradle_kts = build_gradle + ".kts" if os.path.exists(build_gradle): gradlefile = build_gradle - elif os.path.exist(build_gradle_kts): + elif os.path.exists(build_gradle_kts): gradlefile = build_gradle_kts regsub_file(r'compileSdkVersion[ =]+[0-9]+', r'compileSdkVersion %s' % n,