Commit Graph

8240 Commits

Author SHA1 Message Date
Hans-Christoph Steiner 4c03082d14 Merge branch 'gradle' into 'master'
gradle 8.7

See merge request fdroid/fdroidserver!1460
2024-03-24 21:30:08 +00:00
linsui 1f28fce1ea gradle 8.7 2024-03-24 20:03:54 +08:00
Jochen Sprickerhof 6ab4b99a5f Merge branch 'jdk17' into 'master'
checkupdates: add a bookworm blocklist item

See merge request fdroid/fdroidserver!1458
2024-03-15 07:15:26 +00:00
linsui 082df1d9b6 checkupdates: add a bookworm blocklist item 2024-03-14 21:44:32 +08:00
Michael Pöhn f7ca36a66b Merge branch 'appdirs' into 'master'
use appdirs to get easy cross-platform standard directories

See merge request fdroid/fdroidserver!1457
2024-03-14 12:44:10 +00:00
Hans-Christoph Steiner 6781525ddd use appdirs to get easy cross-platform standard directories
This is more important to get right now, with `fdroid install`, which
should work easily on all platforms.
2024-03-14 12:43:02 +00:00
Hans-Christoph Steiner f003492574 Merge branch 'bookworm' into 'master'
Upgrade build server images to Bookworm

See merge request fdroid/fdroidserver!1439
2024-03-14 12:26:14 +00:00
proletarius101 ac4694fcd3
fix `Could not initialize class org.codehaus.groovy.runtime.InvokerHelper`
https://gitlab.com/proletarius101/fdroidserver/-/jobs/6068794117#L547
2024-03-14 13:14:41 +01:00
proletarius101 b20a14af09
fix unnecessary or invalid openjdk installation scripts 2024-03-14 13:14:41 +01:00
proletarius101 f2bdf5214a
install openjdk 11 from bullseye repo instead in the test cases 2024-03-14 13:14:41 +01:00
proletarius101 1bd35fc37f
upgrade basebox to 12.20231211.1 2024-03-14 13:14:41 +01:00
proletarius101 0a3f785254
drop gradle support before 7.3
debian bookworm supports only Java 17+, which is compatible with gradle 7.3+: https://docs.gradle.org/current/userguide/compatibility.html
2024-03-14 13:14:41 +01:00
proletarius101 a0a766cc8e
drop gradle support before 2.0
debian bullseye supports only Java 8+, which is compatible with gradle 2.0+: https://docs.gradle.org/current/userguide/compatibility.html
2024-03-14 13:14:41 +01:00
proletarius101 cf74ca5f56
update docker image tag 2024-03-14 13:14:41 +01:00
proletarius101 2fc9564ebe
use full base docker image 2024-03-14 13:14:40 +01:00
Licaon_Kter 5dc327e867
add missed file 2024-03-14 13:14:40 +01:00
Licaon_Kter 5733545972
fine tune purge 2024-03-14 13:14:40 +01:00
Licaon_Kter 27206162d4
Upgrade Buildserver VM to latest Debian (Bookworm) 2024-03-14 13:14:39 +01:00
Licaon_Kter d31856b6c7
Upgrade Buildserver VM to latest Debian (Bookworm) 2024-03-14 13:14:35 +01:00
Licaon_Kter f30dcf5069
Upgrade Buildserver VM to latest Debian (Bookworm) 2024-03-14 13:14:34 +01:00
Hans-Christoph Steiner 9105738427 Merge branch 'windows-path-split-fix' into 'master'
Fix path splitting error on Windows

See merge request fdroid/fdroidserver!1452
2024-03-13 19:46:08 +00:00
Sergey Zolotarev 6d71690946 Fix path splitting error on Windows 2024-03-13 19:44:44 +00:00
Hans-Christoph Steiner 980ff3c20a Merge branch 'fix_generic_whatsNew' into 'master'
Add unversioned whatsNew to index-v2 (Closes: #1202)

Closes #1202

See merge request fdroid/fdroidserver!1456
2024-03-13 18:11:00 +00:00
Jochen Sprickerhof edb2d76e25
Add unversioned whatsNew to index-v2 (Closes: #1202)
copy_triple_t_store_metadata() can read the whatsNew from an unversioned
release-notes.txt. For v2 copy this to the latest build.
2024-03-13 06:40:33 +01:00
Hans-Christoph Steiner b222275d77 Merge branch 'uri' into 'master'
scanner: update maven repo regex

See merge request fdroid/fdroidserver!1453
2024-03-12 07:57:11 +00:00
linsui a002e46997 scanner: update maven repo regex 2024-03-12 07:57:11 +00:00
Hans-Christoph Steiner 07a0bd7314 Merge branch 'https-apt' into 'master'
gitlab-ci: always use HTTPS for apt repos

See merge request fdroid/fdroidserver!1450
2024-03-06 14:01:38 +00:00
Hans-Christoph Steiner 3560a2522a
gitlab-ci: docker:git has become stable, so switch to stable tag
When this job was implemented, it needed the "git" tag.  Now that it works,
still with the stable tag.
2024-03-06 14:51:19 +01:00
Hans-Christoph Steiner 7b45ea7898
gitlab-ci: always use HTTPS for apt repos
This has been in place in a number of other places and has proven stable,
so I'm introducing it here, since the "docker" job actually publishes
docker images that are publicly used.  So little painless security fixes
are worthwhile.
2024-03-06 14:50:51 +01:00
Hans-Christoph Steiner 2f556a9026 Merge branch 'net-install-tests' into 'master'
tests and code format from %"mirroring resilience" work

See merge request fdroid/fdroidserver!1451
2024-03-06 13:32:12 +00:00
Hans-Christoph Steiner cff3364fdf split out mirrors data structure into standalone, tested function 2024-03-06 13:31:46 +00:00
Hans-Christoph Steiner 9749282b44 net: fix test_download_file_url_parsing
self.assertTrue(requests_get.called) will always be true because .called
will contain a MagicMock instance.
2024-03-06 13:31:46 +00:00
Hans-Christoph Steiner 7904f12d05 net: add test of automatic retries in download_file()
The existing logic from d1ddd525c in !1225 is confusing because it adds its
own retry loop on top of the retry mechanism that is built into requests.
So this test confirms that setting `download_file(retries=3)` actually
results in more than three retries.
2024-03-06 13:31:46 +00:00
Hans-Christoph Steiner 074dda4b61 use tiny entry.jar rather than large index-v1.jar for net test case 2024-03-06 13:31:46 +00:00
Hans-Christoph Steiner 261be20109 convert tests/testcommon.py to black code format 2024-03-06 13:31:46 +00:00
Hans-Christoph Steiner 617a9e75c7 convert install.py to black code format 2024-03-06 13:31:46 +00:00
Michael Pöhn 9dc14674f1 Merge branch 'nice-console-output' into 'master'
method to globally set logging to output nicely to the console

See merge request fdroid/fdroidserver!1449
2024-03-06 13:03:18 +00:00
Hans-Christoph Steiner 76d9eddb3a method to globally set logging to output nicely to the console
This will make all of the direct calls to logging level functions output
in a format that looks appropriate for the console. Previously, the default
output looked like it should be written to a log file.
2024-03-06 12:53:20 +00:00
Hans-Christoph Steiner 091fe9b260 Merge branch 'litecoin' into 'master'
fix litecoin address regex

See merge request fdroid/fdroidserver!1441
2024-02-28 08:01:03 +00:00
linsui 7913df25ba fix litecoin address regex 2024-02-28 08:00:39 +00:00
Hans-Christoph Steiner c5d4b5b991 Merge branch 'nonfreenet-non-changeable' into 'master'
add 'non-changeable' to NonFreeNet description

See merge request fdroid/fdroidserver!1448
2024-02-21 17:31:58 +00:00
Nitai Sasson 8931e038d6 add 'non-changeable' to NonFreeNet description 2024-02-21 17:13:58 +01:00
Hans-Christoph Steiner ba59241422 Merge branch 'refresh-scanner-in-buildserver-vm' into 'master'
build: pass --refresh-scanner thru to buildserver VM

See merge request fdroid/fdroidserver!1447
2024-02-16 15:36:34 +00:00
Hans-Christoph Steiner 04cedd1808 build: pass --refresh-scanner thru to buildserver VM 2024-02-16 11:43:42 +01:00
Hans-Christoph Steiner 35c373a473 Merge branch 'gradle-release-checksums.py' into 'master'
update to gradle v7.6.4

See merge request fdroid/fdroidserver!1445
2024-02-14 17:41:46 +00:00
fdroid-bot ec88cc627f gradle v8.6 2024-02-14 17:32:15 +00:00
Hans-Christoph Steiner 3c77ac66b1
gitlab-ci: revert to old config.py for servergitmirrors: job 2024-02-14 18:31:25 +01:00
Hans-Christoph Steiner c794c0fe18 Merge branch 'fixup-1438' into 'master'
fixups from "feat: add servergitmirrors as a dict support"

See merge request fdroid/fdroidserver!1446
2024-02-14 17:12:17 +00:00
Hans-Christoph Steiner 4e0c721b04 fixups from "feat: add servergitmirrors as a dict support"
These slipped by in reviewing fdroidserver!1438
https://gitlab.com/fdroid/fdroidserver/-/jobs/6173435409
2024-02-14 18:10:29 +01:00
Hans-Christoph Steiner 094764398a Merge branch 'servergitmirrors-as-dict' into 'master'
feat: add servergitmirrors as a dict support

See merge request fdroid/fdroidserver!1438
2024-02-14 16:50:40 +00:00