Commit Graph

8304 Commits

Author SHA1 Message Date
linsui e2e7782ef3 add --force to git deinit 2023-11-25 22:11:19 +08:00
Michael Pöhn 9b38690df6 Merge branch 'port-test-jq-to-gnu-sed' into 'master'
remove jq dependency in the tests, port to GNU sed

See merge request fdroid/fdroidserver!1410
2023-11-23 12:29:25 +00:00
Hans-Christoph Steiner f13d9235ce remove jq dependency in the tests, port to GNU sed
This avoids spreading the jq dependency to more places, like:

https://gitlab.com/eighthave/ansible-role-install-fdroidserver-dependencies/-/jobs/5559798360

And is helpful when porting to non-Debian platforms.
2023-11-23 12:24:49 +00:00
Michael Pöhn 4b5dd72674 Merge branch 'ruamel' into 'master'
set ruamel.yaml version to older than 1.17.22

See merge request fdroid/fdroidserver!1389
2023-11-23 12:24:32 +00:00
linsui 6a7a6e310b set ruamel.yaml version to older than 1.17.22
Newer version changed the behavior
2023-11-23 12:17:56 +00:00
Jochen Sprickerhof ecb6b599b6 Merge branch 'remove_glay_repotrunk' into 'master'
Remove --gplay option and UpdateCheckMode "RepoTrunk"

See merge request fdroid/fdroidserver!1402
2023-11-21 07:27:08 +00:00
Gregor Düster b5424d40f1 [checkupdates] Remove UpdateCheckMode "RepoTrunk"
It's unclear whether this still works and we're not planning to maintain
it.
2023-11-21 07:18:17 +00:00
Gregor Düster 81fdba452a [checkupdates] Remove --gplay option
It's unclear whether this still works and we're not planning to maintain
it.
2023-11-21 07:18:17 +00:00
Jochen Sprickerhof cbfb12f917 Merge branch 'revert--filter-blob-none' into 'master'
Revert "Clone without blobs to save space"

Closes #1177

See merge request fdroid/fdroidserver!1409
2023-11-20 09:23:21 +00:00
Hans-Christoph Steiner 3e9f27612e Revert "Clone without blobs to save space" !1382
This seems to make git ignore the _fsck skipList_ files.

This reverts commit 24ea1f6852.

closes #1177
fdroid-bootstrap-buildserver!34
!1408
2023-11-20 10:07:05 +01:00
Hans-Christoph Steiner 79adc6f57a Merge branch 'fetchsrclib' into 'master'
fetch_srclib: fetch source code

See merge request fdroid/fdroidserver!1407
2023-11-17 10:46:06 +00:00
linsui 5ae15532f0 fetch_srclib: fetch source code 2023-11-17 10:45:53 +00:00
Hans-Christoph Steiner cbbb255551 Merge branch 'python3.12_docker' into 'master'
buildserver: Add python3-packaging dependency

See merge request fdroid/fdroidserver!1406
2023-11-17 09:16:54 +00:00
Andrew Gunnerson f4f1de941c
buildserver: Add python3-packaging dependency
Signed-off-by: Andrew Gunnerson <accounts+gitlab@chiller3.com>
2023-11-15 18:43:58 -05:00
Jochen Sprickerhof 5751a50f21 Merge branch 'deinit' into 'master'
deinit git submodule

See merge request fdroid/fdroidserver!1404
2023-11-15 14:02:14 +00:00
linsui f99f430e9e deinit git submodule 2023-11-14 01:06:49 +08:00
Hans-Christoph Steiner f14efd849c Merge branch 'install-android-m2repository-without-sudo' into 'master'
allow gradle/sdkmanager to install extras;android;m2repository

Closes #1169

See merge request fdroid/fdroidserver!1399
2023-11-09 12:26:07 +00:00
Hans-Christoph Steiner 8aad2dd0c3 allow gradle/sdkmanager to install extras;android;m2repository
closes #1169
2023-11-09 12:25:33 +00:00
Hans-Christoph Steiner 79d69696a4 Merge branch 'clone_without_blobs' into 'master'
Clone without blobs to save space

See merge request fdroid/fdroidserver!1382
2023-11-09 12:22:20 +00:00
sim 24ea1f6852 Clone without blobs to save space 2023-11-09 12:13:29 +00:00
Jochen Sprickerhof bb5fc0a380 Merge branch 'fixup_more_docstrings' into 'master'
[docs] Remove unnecessary use of Union

See merge request fdroid/fdroidserver!1401
2023-11-06 08:46:05 +00:00
Gregor Düster 81fea25509
[docs] Remove unnecessary use of Union 2023-10-26 09:17:43 +02:00
Jochen Sprickerhof f4b10cf839 Merge branch 'more_docstrings' into 'master'
[checkupdates] Add more docstrings

See merge request fdroid/fdroidserver!1400
2023-10-23 08:54:38 +00:00
Gregor Düster 02b855da5e
[docs] Start utilising intersphinx 2023-10-22 21:27:08 +02:00
Gregor Düster f238470855
[docs] Put type annotations in type hints instead of docstring 2023-10-22 21:01:27 +02:00
Gregor Düster 7b715bb2c9
[docs] Enable intersphinx 2023-10-22 20:43:52 +02:00
Gregor Düster 5503a05ef6
[checkupdates] Add more docstrings 2023-10-22 19:19:56 +02:00
Hans-Christoph Steiner d036d5be36 Merge branch 'fix-typo-build-py' into 'master'
Fix typo in build.py

See merge request fdroid/fdroidserver!1398
2023-10-10 14:26:52 +00:00
cvzi af1c5d4e5d Fix typo in build.py
encoutered -> encountered
2023-10-10 12:14:20 +00:00
Jochen Sprickerhof 3f8c3cdf18 Merge branch 'safety-ignore-patched-cves' into 'master'
safety: ignore CVEs patched in Debian

See merge request fdroid/fdroidserver!1397
2023-10-10 07:43:47 +00:00
Hans-Christoph Steiner 667567abb8
safety: ignore CVEs patched in Debian 2023-10-10 09:33:51 +02:00
Hans-Christoph Steiner 7af54754e6 Merge branch 'gradle-release-checksums.py' into 'master'
update to gradle v7.6.3

See merge request fdroid/fdroidserver!1396
2023-10-10 07:27:00 +00:00
fdroid-bot 1ddc448f15 gradle v8.4 2023-10-10 07:19:29 +00:00
Hans-Christoph Steiner 608e2d0839 Merge branch 'gradle84' into 'master'
Gradle 8.4

See merge request fdroid/fdroidserver!1395
2023-10-10 07:18:54 +00:00
Licaon_Kter 2a33567577 Gradle 8.4 2023-10-10 07:18:42 +00:00
Hans-Christoph Steiner 113bf3a769 Merge branch 'fix_logging' into 'master'
Ignore encoding errors in logs

See merge request fdroid/fdroidserver!1394
2023-10-10 07:16:15 +00:00
Jochen Sprickerhof 49c415424d
Ignore encoding errors in logs
Found while compiling io.privatestorage.privatestoragemobile_9:

Traceback (most recent call last):
  File "/home/fdroid/fdroidserver/fdroidserver/build.py", line 1053, in main
    if trybuild(app, build, build_dir, output_dir, log_dir,
  File "/home/fdroid/fdroidserver/fdroidserver/build.py", line 813, in trybuild
    build_server(app, build, vcs, build_dir, output_dir, log_dir, force)
  File "/home/fdroid/fdroidserver/fdroidserver/build.py", line 253, in build_server
    logging.debug("buildserver > " + str(line, 'utf-8').rstrip())
UnicodeDecodeError: 'utf-8' codec can't decode byte 0xfa in position 8: invalid start byte
2023-09-27 17:41:26 +02:00
Hans-Christoph Steiner 047819d34f Merge branch 'weblate' into 'master'
Sync translations with Weblate

See merge request fdroid/fdroidserver!1393
2023-09-22 08:23:53 +00:00
Gregor Düster d6187679b6
locale/ro: Fix template string 2023-09-22 09:37:33 +02:00
Yaron Shahrabani a2f9ca4bf4
Translated using Weblate: Hebrew (he) by Yaron Shahrabani <sh.yaron@gmail.com>
Currently translated at 4.5% (25 of 552 strings)

Translation: F-Droid/F-Droid Server
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/he/
2023-09-21 14:23:37 +00:00
Xiang Heng Wei 5dd325941c
Translated using Weblate: Chinese (Simplified) (zh_Hans) by Xiang Heng Wei <yylteam@hotmail.com>
Currently translated at 79.5% (439 of 552 strings)

Translation: F-Droid/F-Droid Server
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/zh_Hans/
2023-09-21 14:23:37 +00:00
Bai edfe52a5eb
Translated using Weblate: Turkish (tr) by Bai <batuhanakkurt000@gmail.com>
Currently translated at 100.0% (552 of 552 strings)

Translation: F-Droid/F-Droid Server
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/tr/
2023-09-21 14:23:36 +00:00
Random 376209dcca
Translated using Weblate: Italian (it) by Random <random-r@users.noreply.hosted.weblate.org>
Currently translated at 100.0% (552 of 552 strings)

Translation: F-Droid/F-Droid Server
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/it/
2023-09-21 14:23:36 +00:00
Random e2ba75aa51
Translated using Weblate: Italian (it) by Random <random-r@users.noreply.hosted.weblate.org>
Currently translated at 96.7% (534 of 552 strings)

Translation: F-Droid/F-Droid Server
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/it/
2023-09-21 14:23:35 +00:00
Random 36cadf0103
Translated using Weblate: Italian (it) by Random <random-r@users.noreply.hosted.weblate.org>
Currently translated at 96.5% (533 of 552 strings)

Translation: F-Droid/F-Droid Server
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/it/
2023-09-21 14:23:34 +00:00
The Cats 95e85c2a86
Translated using Weblate: Portuguese (Brazil) (pt_BR) by The Cats <philosoph@danwin1210.de>
Currently translated at 100.0% (552 of 552 strings)

Translation: F-Droid/F-Droid Server
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/pt_BR/
2023-09-21 14:23:34 +00:00
Simona Iacob 3761e3368c
Translated using Weblate: Romanian (ro) by Simona Iacob <s@zp1.net>
Currently translated at 95.1% (525 of 552 strings)

Translation: F-Droid/F-Droid Server
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/ro/
2023-09-21 14:23:33 +00:00
HM c26f0d0da8
Translated using Weblate: Persian (fa) by HM <goodlinuxuser@chmail.ir>
Currently translated at 7.7% (43 of 552 strings)

Translation: F-Droid/F-Droid Server
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/fa/
2023-09-21 14:23:33 +00:00
The Cats fb36179919
Translated using Weblate: Portuguese (Brazil) (pt_BR) by The Cats <philosoph@danwin1210.de>
Currently translated at 96.9% (535 of 552 strings)

Translation: F-Droid/F-Droid Server
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/pt_BR/
2023-09-21 14:23:32 +00:00
coronabond 84839b5914
Translated using Weblate: Italian (it) by coronabond <coronabond@airmail.cc>
Currently translated at 96.3% (532 of 552 strings)

Translation: F-Droid/F-Droid Server
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/it/
2023-09-21 14:23:31 +00:00