From 6eb895a7005504a464d34957533ff0f2df22cf06 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 26 May 2021 19:42:15 +0200 Subject: [PATCH 1/5] makebuilserver: only install most recent two releases --- makebuildserver | 6 ------ 1 file changed, 6 deletions(-) diff --git a/makebuildserver b/makebuildserver index d1298720..ad8dc48f 100755 --- a/makebuildserver +++ b/makebuildserver @@ -281,14 +281,8 @@ CACHE_FILES = [ '565af786dc0cc1941002174fb945122eabd080b222cd4c7c3d9a2ae0fabf5dc4'), ('https://dl.google.com/android/repository/build-tools_r30.0.3-linux.zip', '24593500aa95d2f99fb4f10658aae7e65cb519be6cd33fa164f15f27f3c4a2d6'), - ('https://services.gradle.org/distributions/gradle-6.8.2-bin.zip', - '8de6efc274ab52332a9c820366dd5cf5fc9d35ec7078fd70c8ec6913431ee610'), ('https://services.gradle.org/distributions/gradle-6.8.3-bin.zip', '7faa7198769f872826c8ef4f1450f839ec27f0b4d5d1e51bade63667cbccd205'), - ('https://services.gradle.org/distributions/gradle-7.0-bin.zip', - 'eb8b89184261025b0430f5b2233701ff1377f96da1ef5e278af6ae8bac5cc305'), - ('https://services.gradle.org/distributions/gradle-7.0.1-bin.zip', - 'dccda8aa069563c8ba2f6cdfd0777df0e34a5b4d15138ca8b9757e94f4e8a8cb'), ('https://services.gradle.org/distributions/gradle-7.0.2-bin.zip', '0e46229820205440b48a5501122002842b82886e76af35f0f3a069243dca4b3c'), ('https://dl.google.com/android/repository/android-ndk-r21e-linux-x86_64.zip', From adafd4560c2a9c1f3a17eb371b130a8742caf229 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Fri, 28 May 2021 09:02:19 +0200 Subject: [PATCH 2/5] provision-android-sdk: ensure ANDROID_HOME parent dir is accessible by all https://gitlab.com/fdroid/fdroidserver/-/merge_requests/926#note_586778883 --- buildserver/provision-android-sdk | 1 + 1 file changed, 1 insertion(+) diff --git a/buildserver/provision-android-sdk b/buildserver/provision-android-sdk index d0e73d8a..1ca5ec19 100644 --- a/buildserver/provision-android-sdk +++ b/buildserver/provision-android-sdk @@ -122,6 +122,7 @@ echo y | $ANDROID_HOME/tools/bin/sdkmanager "extras;m2repository;com;android;sup echo y | $ANDROID_HOME/tools/bin/sdkmanager "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2" echo y | $ANDROID_HOME/tools/bin/sdkmanager "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.2" +chmod a+X $(dirname $ANDROID_HOME/) chmod -R a+rX $ANDROID_HOME/ chgrp vagrant $ANDROID_HOME chmod g+w $ANDROID_HOME From 45bd89b3a235070f0ac143747451ae9dcccdc104 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Fri, 28 May 2021 09:23:16 +0200 Subject: [PATCH 3/5] build: missing NDK is now a warning not a critical error --- fdroidserver/build.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fdroidserver/build.py b/fdroidserver/build.py index 6c3fa790..7c4d900b 100644 --- a/fdroidserver/build.py +++ b/fdroidserver/build.py @@ -361,12 +361,12 @@ def build_local(app, build, vcs, build_dir, output_dir, log_dir, srclib_dir, ext ndk_path = build.ndk_path() if build.ndk or (build.buildjni and build.buildjni != ['no']): if not ndk_path: - logging.critical("Android NDK version '%s' could not be found!" % build.ndk) - logging.critical("Configured versions:") + logging.warning("Android NDK version '%s' could not be found!" % build.ndk) + logging.warning("Configured versions:") for k, v in config['ndk_paths'].items(): if k.endswith("_orig"): continue - logging.critical(" %s: %s" % (k, v)) + logging.warning(" %s: %s" % (k, v)) if onserver: common.auto_install_ndk(build) else: From 153b5d43929f4094414dd7388c5c8a6512f91aaf Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Fri, 28 May 2021 10:21:52 +0200 Subject: [PATCH 4/5] stop modifying default_config when running fill_config_defaults() dicts and lists are passed by reference in assignments, so this needs to copy them instead. --- fdroidserver/common.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 851fdea5..4af0595f 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -224,7 +224,10 @@ def fill_config_defaults(thisconfig): """ for k, v in default_config.items(): if k not in thisconfig: - thisconfig[k] = v + if isinstance(v, dict) or isinstance(v, list): + thisconfig[k] = v.copy() + else: + thisconfig[k] = v # Expand paths (~users and $vars) def expand_path(path): From 52ac0f0176b0808e8c4d1c45d249c8c853632167 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Fri, 28 May 2021 10:32:09 +0200 Subject: [PATCH 5/5] ndk-release-checksums.py: fix crash, there is no version here --- tests/ndk-release-checksums.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/ndk-release-checksums.py b/tests/ndk-release-checksums.py index 6e99d6a0..4f7574b7 100755 --- a/tests/ndk-release-checksums.py +++ b/tests/ndk-release-checksums.py @@ -131,7 +131,7 @@ if git_repo.is_dirty() and 'fdroidserver/common.py' in modified: 'source_branch': branch.name, 'target_project_id': 36527, # fdroid/fdroidserver 'target_branch': 'master', - 'title': 'update to gradle v' + version, + 'title': 'update NDK', 'description': description, 'labels': ['fdroid-bot', 'buildserver'], 'remove_source_branch': True,