From 778e600269da771abbb96b760bdf526a54f0cd7e Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Mon, 29 Nov 2021 12:13:09 +0100 Subject: [PATCH 1/3] gitlab-ci: enable pyjks in lint_mypy job now that it is in backports --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 41c5d045..c11f0bcc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -203,16 +203,16 @@ lint_format_safety_bandit_checks: lint_mypy: - image: debian:bullseye + image: debian:bullseye-backports <<: *apt-template script: - - sed -i '/pyjks/d' setup.py # TODO get from backports once available # use Debian packages to avoid building C/rust sources - apt-get install mypy python3-cryptography python3-pip python3-wheel + - apt-get install -t bullseye-backports python3-pyjks - pip install -e .[test] - mypy From 319bf47a6b4e3fda370b5e2471431d1c4cc8d2d7 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Mon, 29 Nov 2021 12:15:46 +0100 Subject: [PATCH 2/3] enable intel-android-extra-license on buildserver, it is DFSG-free It is a BSD-3-clause: https://gitlab.com/fdroid/android-sdk-transparency-log/-/blob/38f9564932deeee8ed66806e93e8fda4c19c172c/android/repository/addon.xml#L568 --- buildserver/provision-android-sdk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/buildserver/provision-android-sdk b/buildserver/provision-android-sdk index 4814ca40..e8fa1834 100644 --- a/buildserver/provision-android-sdk +++ b/buildserver/provision-android-sdk @@ -117,6 +117,11 @@ cat < $ANDROID_HOME/licenses/android-sdk-preview-license-old 84831b9409646a918e30573bab4c9c91346d8abd EOF +cat < $ANDROID_HOME/licenses/intel-android-extra-license + +d975f751698a77b662f1254ddbeed3901e976f5a +EOF + echo y | $ANDROID_HOME/tools/bin/sdkmanager "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1" echo y | $ANDROID_HOME/tools/bin/sdkmanager "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.1" echo y | $ANDROID_HOME/tools/bin/sdkmanager "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2" From c54f9ea4ca5044c03f0882b0ad58815e7d4ef3fa Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Mon, 29 Nov 2021 12:18:43 +0100 Subject: [PATCH 3/3] mirror: make _run_wget() return to the dir it started in This kind of function should not change the working environment, especially since so much of the fdroidserver code assumes the current working directory is the root of an fdroid repo. It is used in fdroidserver/mirror.py with absolute paths always, so it shouldn't change any existing use. I found this issue by using it in a plugin. --- fdroidserver/mirror.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fdroidserver/mirror.py b/fdroidserver/mirror.py index 3187a3d3..27603a85 100644 --- a/fdroidserver/mirror.py +++ b/fdroidserver/mirror.py @@ -27,6 +27,7 @@ def _run_wget(path, urls): if not urls: return logging.debug(_('Running wget in {path}').format(path=path)) + cwd = os.getcwd() os.makedirs(path, exist_ok=True) os.chdir(path) urls_file = '.fdroid-mirror-wget-input-file' @@ -43,6 +44,7 @@ def _run_wget(path, urls): ] ) os.remove(urls_file) + os.chdir(cwd) # leave the working env the way we found it def main():