From c6e8dfd4dd60e24a98c3080bdc26426b15346267 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 4 Sep 2024 15:42:55 +0200 Subject: [PATCH 1/3] CONTRIBUTING: specify which Black version for format --- CONTRIBUTING.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 46deed5d..226c0854 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -44,7 +44,8 @@ guidelines: formatted as _black_. Some files are not yet fully in _black_ format (see _pyproject.toml_), our goal is to opportunistically convert the code whenever possible. As of the time of this writing, forcing the code format on all files - would be too disruptive. + would be too disruptive. The officially supported _black_ version is the one + in Debian/stable. * Many of the tests run very fast and can be run interactively in isolation. Some of the essential test cases run slowly because they do things like From a386a6132a2b6c0342522520ea9218ae4c93f31d Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Fri, 6 Sep 2024 11:18:32 +0200 Subject: [PATCH 2/3] README: document how releases work --- README.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/README.md b/README.md index 8c895745..3af7b8fb 100644 --- a/README.md +++ b/README.md @@ -34,6 +34,19 @@ package managers. All of the options are documented on the website: https://f-droid.org/docs/Installing_the_Server_and_Repo_Tools +## Releases + +The production setup of _fdroidserver_ for f-droid.org is run directly from the +_master_ branch. This is put into production on an schedule (currently weekly). +So development and testing happens in the branches. We track branches using +merge requests. Therefore, there are many WIP and long-lived merge requests. + +There are also stable releases of _fdroidserver_. This is mostly intended for +running custom repositories, where the build process is separate. It can also +be useful as a simple way to get started contributing packages to _fdroiddata_, +since the stable releases are available in package managers. + + ## Tests To run the full test suite: From 22204f4e07455dba7f9eaada7543cf4183aa0cda Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Fri, 6 Sep 2024 11:18:47 +0200 Subject: [PATCH 3/3] README: remove obsolete section on buildserver tests --- README.md | 8 -------- 1 file changed, 8 deletions(-) diff --git a/README.md b/README.md index 3af7b8fb..adc33128 100644 --- a/README.md +++ b/README.md @@ -88,14 +88,6 @@ locally](https://docs.gitlab.com/runner/commands/README.html#gitlab-runner-exec) like this: `gitlab-runner exec docker ubuntu_lts` -### Buildserver - -The tests for the whole build server setup are entirely separate -because they require at least 200 GB of disk space, and 8 GB of -RAM. These test scripts are in the root of the project, all starting -with _jenkins-_ since they used to be run on https://jenkins.debian.net. - - ## Documentation The API documentation based on the docstrings gets automatically