Commit graph

9155 commits

Author SHA1 Message Date
Hans-Christoph Steiner
e8f7771c1f tests: suppress "WARNING:root:unsafe permissions on 'config.yml' (should be 0600)!" 2025-09-29 13:25:13 +02:00
Hans-Christoph Steiner
04ec16d68a deploy: move remote repo to common test setup in TestServerGitMirrors 2025-09-29 13:25:13 +02:00
Hans-Christoph Steiner
5fcc5b1252 deploy: simplify asserts in servergitmirrors tests 2025-09-29 13:25:13 +02:00
Hans-Christoph Steiner
a96e647b2f deploy: common test setup for all tests of servergitmirrors
This refactors the servergitmirrors tests into their own class.
2025-09-29 13:25:13 +02:00
Hans-Christoph Steiner
b6e73345e2 deploy: convert to common.get_config()
717df09be0
2025-09-29 13:25:13 +02:00
Hans-Christoph Steiner
61842d626d nightly: print error if env var is missing
This should help with debugging a lot. Before this, it showed an obtuse
stacktrace when an env var was not set:

```
Traceback (most recent call last):
  File "/usr/bin/fdroid", line 33, in <module>
    sys.exit(load_entry_point('fdroidserver==2.4.0', 'console_scripts', 'fdroid')())
             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/usr/lib/python3/dist-packages/fdroidserver/__main__.py", line 222, in main
    raise e
  File "/usr/lib/python3/dist-packages/fdroidserver/__main__.py", line 203, in main
    mod.main()
  File "/usr/lib/python3/dist-packages/fdroidserver/nightly.py", line 352, in main
    writer.set_value('user', 'name', git_user_name)
  File "/usr/lib/python3/dist-packages/git/config.py", line 122, in assure_data_present
    return func(self, *args, **kwargs)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/usr/lib/python3/dist-packages/git/config.py", line 134, in flush_changes
    rval = non_const_func(self, *args, **kwargs)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/usr/lib/python3/dist-packages/git/config.py", line 855, in set_value
    self.set(section, option, self._value_to_string(value))
                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/usr/lib/python3/dist-packages/git/config.py", line 838, in _value_to_string
    return force_text(value)
           ^^^^^^^^^^^^^^^^^
  File "/usr/lib/python3/dist-packages/gitdb/utils/encoding.py", line 18, in force_text
    return str(data, encoding)
           ^^^^^^^^^^^^^^^^^^^
TypeError: decoding to str: need a bytes-like object, NoneType found
```
2025-09-29 13:25:13 +02:00
Hans-Christoph Steiner
86be5be09d import GitPython exceptions using public module to placate pylint
************* Module fdroidserver.nightly
fdroidserver/nightly.py:239:11: E1101: Instance of 'GitError' has no 'GitCommandError' member (no-member)
fdroidserver/nightly.py:239:11: E1101: Instance of 'Exception' has no 'GitCommandError' member (no-member)
2025-09-29 13:25:13 +02:00
Hans-Christoph Steiner
0a5f15dad7 nightly: GitLab URLs end in '.git' to avoid warning and redirects
warning: redirecting to https://gitlab.com/fdroid/fdroidclient-nightly.git/
2025-09-29 13:25:13 +02:00
Jochen Sprickerhof
98aaf1ba7c Merge branch 'example.com-default' into 'master'
use example.com as default repo domain name, closes admin#300

Closes admin#300

See merge request fdroid/fdroidserver!1704
2025-09-29 11:21:50 +00:00
Hans-Christoph Steiner
4cf3727db7 use example.com as default repo domain name, closes admin#300 2025-09-29 11:21:00 +00:00
Hans-Christoph Steiner
40fbbd2e48 Merge branch 'wire--checksum-to-rclone' into 'master'
deploy: wire up --no-checksum option to rclone functionality

See merge request fdroid/fdroidserver!1705
2025-09-25 14:32:51 +00:00
Hans-Christoph Steiner
4fabdf9290 deploy: wire up --checksum option to rclone functionality
By default `fdroid deploy` uses the checksum to check for changed files.
The rclone code should do the same.
2025-09-25 16:21:50 +02:00
Hans-Christoph Steiner
7c2a0aa6c2 Merge branch 'fix-tests-for-replacing-s3cmd-and-libcloud' into 'master'
Fix tests for replacing s3cmd and libcloud

See merge request fdroid/fdroidserver!1703
2025-09-25 14:21:02 +00:00
paul mayero
ffc0a6cec0 Fix tests for replacing s3cmd and libcloud 2025-09-25 14:21:02 +00:00
Michael Pöhn
bf33fc5d9b Merge branch 'scanner' into 'master'
scanner: fix catalog match

See merge request fdroid/fdroidserver!1692
2025-09-18 11:31:13 +00:00
linsui
5ded08048b scanner: remove asLibraryDependency from catalog accessor 2025-09-18 11:19:32 +00:00
linsui
5f6e59c76d scanner: fix catalog match 2025-09-18 11:19:32 +00:00
linsui
9b8a334dcf Merge branch 'checkupdates-fix-get_upstream_main_branch' into 'master'
checkupdates: fix get_upstream_main_branch() for Debian/forky

See merge request fdroid/fdroidserver!1702
2025-09-18 10:57:09 +00:00
Hans-Christoph Steiner
8b11e098db checkupdates: fix get_upstream_main_branch() for Debian/forky
```
FAIL: test_get_upstream_main_branch (tests.test_checkupdates.CheckupdatesTest.test_get_upstream_main_branch)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/builds/fdroid/fdroidserver/tests/test_checkupdates.py", line 509, in test_get_upstream_main_branch
    self.assertEqual(
    ~~~~~~~~~~~~~~~~^
        f'upstream/{testvalue}',
        ^^^^^^^^^^^^^^^^^^^^^^^^
        branch,
        ^^^^^^^
        f'The default branch should be called {testvalue}!',
        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    )
    ^
AssertionError: 'upstream/foo' != 'upstream/main'
- upstream/foo
+ upstream/main
 : The default branch should be called foo!
```
2025-09-18 10:52:15 +00:00
Hans-Christoph Steiner
c9c5147cac Merge branch 'user-rclone.conf' into 'master'
deploy: find rclone.conf in the root of the repo

See merge request fdroid/fdroidserver!1701
2025-09-18 10:01:04 +00:00
thefuture
b6d6d46aeb error if repo rclone.conf is not referenced in config.yml 2025-09-18 11:06:04 +02:00
Hans-Christoph Steiner
1f9fb16844 deploy: find rclone.conf in the root of the repo
This enables the same way of managing the config as existed with s3cmd's
s3cfg file.
2025-09-18 11:05:18 +02:00
Hans-Christoph Steiner
0a87deff1c Merge branch 'remove-libcloud-and-s3cmd' into 'master'
Remove libcloud and s3cmd from fdroidserver

Closes #1289 and #1288

See merge request fdroid/fdroidserver!1650
2025-09-17 11:36:13 +00:00
paul mayero
dbd769db9f Remove libcloud and s3cmd from fdroidserver 2025-09-17 11:36:12 +00:00
Hans-Christoph Steiner
a9856cfb92 Merge branch 'spelling-versionCode-versionName' into 'master'
standardize on versionCode/versionName as spelling

See merge request fdroid/fdroidserver!1699
2025-09-17 07:08:00 +00:00
Hans-Christoph Steiner
bbe29abaa3 standardize on versionName as spelling 2025-09-17 06:55:46 +00:00
Hans-Christoph Steiner
1068057524 standardize on versionCode as spelling 2025-09-17 06:55:46 +00:00
linsui
e8d4d8fc6a Merge branch 'maven' into 'master'
scanner: remove tailing / from maven repo address

See merge request fdroid/fdroidserver!1700
2025-09-17 06:50:54 +00:00
linsui
f578684be8 scanner: remove tailing / from maven repo address 2025-09-17 14:37:30 +08:00
Hans-Christoph Steiner
57244dec63 Merge branch 'noversioncode' into 'master'
update: Handle APKs without a version code in their manifest

Closes #1240

See merge request fdroid/fdroidserver!1695
2025-08-26 10:10:51 +00:00
Tobias Mueller
2eb3986ecf update: Handle APKs without a version code in their manifest 2025-08-26 10:10:51 +00:00
Hans-Christoph Steiner
d4ad523dd2 Merge branch '__init__.py-black-format' into 'master'
convert fdroidserver/__init__.py to black format

See merge request fdroid/fdroidserver!1690
2025-08-18 15:48:23 +00:00
Hans-Christoph Steiner
6fff73b678 convert fdroidserver/__init__.py to black format 2025-08-18 15:38:08 +00:00
linsui
fbf8fc54db Merge branch 'patch-1' into 'master'
Sonatype is now Maven Central

See merge request fdroid/fdroidserver!1693
2025-08-18 13:32:29 +00:00
Licaon_Kter
f5f79ac1ea Sonatype is now Maven Central 2025-08-18 13:32:29 +00:00
Michael Pöhn
97e9784d5d Merge branch 'fix-srcname-cache-crash' into 'master'
update: don't crash if src tarball is not present

See merge request fdroid/fdroidserver!1691
2025-07-31 15:31:38 +00:00
Hans-Christoph Steiner
d20a6a5dcf update: don't crash if src tarball is not present 2025-07-29 17:20:11 +02:00
Michael Pöhn
058f0b7f6a Merge branch 'cache-srcname-sha256' into 'master'
update: cache the SHA-256 of the src tarball

Closes #1290

See merge request fdroid/fdroidserver!1686
2025-07-28 21:10:40 +00:00
Hans-Christoph Steiner
e07cdf5f0c update: cache the SHA-256 of the src tarball
closes #1290
2025-07-28 14:11:07 +00:00
Hans-Christoph Steiner
f9d111c8c1 Merge branch 'removeunf' into 'master'
Remove UpstreamNonFree

Closes fdroiddata#2481

See merge request fdroid/fdroidserver!1680
2025-07-28 14:10:18 +00:00
Licaon_Kter
8b54e2b4cf Remove UpstreamNonFree 2025-07-28 15:59:35 +02:00
Hans-Christoph Steiner
d594a683ab Merge branch 'isort' into 'master'
Sort import

See merge request fdroid/fdroidserver!1689
2025-07-26 15:47:48 +00:00
linsui
7a98650ed3 Sort import
ruff check --fix --select I
2025-07-26 15:35:19 +00:00
linsui
b19b8050db Merge branch 'fix-schildichat-fastlane' into 'master'
update: more accurate fastlane subdir/flavor matching

See merge request fdroid/fdroidserver!1687
2025-07-26 12:52:31 +00:00
Hans-Christoph Steiner
6a3758d3c4 update: more accurate fastlane subdir/flavor matching
This should fix Schildichat showing Element X's metadata.
2025-07-26 12:36:32 +00:00
Hans-Christoph Steiner
546821fc3d Merge branch 'scanpath' into 'master'
scanner: report all errors

See merge request fdroid/fdroidserver!1688
2025-07-26 10:44:26 +00:00
linsui
120a1655b4 scanner: report all errors 2025-07-26 18:33:57 +08:00
linsui
19d709edcd Merge branch 'standalone-gradlew-fdroid' into 'master'
make gradlew-fdroid a standalone project

See merge request fdroid/fdroidserver!1684
2025-07-25 17:46:59 +00:00
Hans-Christoph Steiner
5049645003 make gradlew-fdroid a standalone project
https://gitlab.com/fdroid/gradlew-fdroid
2025-07-25 17:46:31 +00:00
Hans-Christoph Steiner
e4b54c9768 Merge branch 'docker-buildserver-always-apt-https' into 'master'
buildserver: always use HTTPS for apt connections in Docker image

See merge request fdroid/fdroidserver!1603
2025-07-23 16:24:56 +00:00