From ffc3fbe28883e07a4c780f5fa757ce8f1eed3728 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Mon, 31 Oct 2022 12:50:06 +0100 Subject: [PATCH 1/2] handle default.txt changelog in fdroid metadata/ fixup !1240 --- fdroidserver/update.py | 1 + 1 file changed, 1 insertion(+) diff --git a/fdroidserver/update.py b/fdroidserver/update.py index a6c086ea..5f1178d8 100644 --- a/fdroidserver/update.py +++ b/fdroidserver/update.py @@ -998,6 +998,7 @@ def insert_localized_app_metadata(apps): os.path.join(root, f)) elif f == 'default.txt': # use "default.txt" changelog entry as fallback. + locale = segments[-2] localized = _get_localized_dict(apps[packageName], locale) if not localized.get('whatsNew', ''): _set_localized_text_entry(apps[packageName], locale, 'whatsNew', From ca13325913863ed071b893696a825fde08776ae4 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Mon, 31 Oct 2022 12:55:20 +0100 Subject: [PATCH 2/2] gitlab-ci: simplify ubuntu_jammy_pip job, babel is not needed Babel runs on install now, before it was used to pre-generated the compiled gettext files. --- .gitlab-ci.yml | 13 ++++++------- .yamllint | 5 +++++ 2 files changed, 11 insertions(+), 7 deletions(-) create mode 100644 .yamllint diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a635b038..4fe44dba 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,4 @@ +--- variables: pip: pip3 --timeout 100 --retries 10 @@ -136,16 +137,14 @@ ubuntu_jammy_pip: <<: *apt-template script: - apt-get install git default-jdk-headless python3-pip python3-venv rsync - - rm -rf env - - python3 -m venv env - - . env/bin/activate - - $pip install --upgrade babel pip setuptools + # setup venv to act as release build machine - - python -m venv sdist-env + - python3 -m venv sdist-env - . sdist-env/bin/activate - ./setup.py sdist - deactivate - tar tzf dist/fdroidserver-*.tar.gz + # back to bare machine to act as user's install machine - export ANDROID_HOME=/opt/android-sdk - $pip install sdkmanager @@ -354,7 +353,7 @@ fdroid build: # TODO remove sdkmanager install once it is included in the buildserver image - apt-get install sdkmanager - - rm -rf "$ANDROID_HOME/tools" # TODO remove once sdkmanager can upgrade installed packages + - rm -rf "$ANDROID_HOME/tools" # TODO remove once sdkmanager can upgrade installed packages - sdkmanager "tools" "platform-tools" "build-tools;31.0.0" - git ls-remote https://gitlab.com/fdroid/fdroiddata.git master @@ -462,7 +461,7 @@ servergitmirrors: - python3 -m venv --system-site-packages env - . env/bin/activate - export PYTHONPATH=`pwd` - - export SETUPTOOLS_USE_DISTUTILS=stdlib # https://github.com/pypa/setuptools/issues/2956 + - export SETUPTOOLS_USE_DISTUTILS=stdlib # https://github.com/pypa/setuptools/issues/2956 - $pip install -e . - mkdir /root/.ssh/ - ./tests/key-tricks.py diff --git a/.yamllint b/.yamllint new file mode 100644 index 00000000..6105b5d4 --- /dev/null +++ b/.yamllint @@ -0,0 +1,5 @@ +--- + +extends: default +rules: + line-length: disable