1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-09 17:00:12 +01:00
Commit Graph

8004 Commits

Author SHA1 Message Date
Hans-Christoph Steiner
e03d71f6c3 Merge branch 'support-java-20' into 'master'
support Java 20, which is already in Debian/unstable, closes #1070

Closes #1070

See merge request fdroid/fdroidserver!1304
2023-02-17 15:48:51 +00:00
Hans-Christoph Steiner
f468270aa8
support Java 20, which is already in Debian/unstable, closes #1070 2023-02-17 16:35:20 +01:00
Jochen Sprickerhof
6c76b8ef87 Merge branch 'signindex-tests' into 'master'
signindex: add JSON check for entry.json

Closes #835

See merge request fdroid/fdroidserver!1303
2023-02-17 14:46:55 +00:00
Hans-Christoph Steiner
0c9f62a5fe signindex: add JSON check for entry.json
Ran this to generate/refresh the test index files:
`cd tests; ../fdroid update --nosign --pretty`

* converts config.py description to a single line, since the values are no
  longer stripped, so this give the same output.

closes #835
2023-02-17 14:34:53 +00:00
Hans-Christoph Steiner
6e2b4f65c2 Merge branch 'apksigcopier-1.1.1' into 'master'
update apksigcopier to upstream v1.1.1

See merge request fdroid/fdroidserver!1302
2023-02-17 13:20:40 +00:00
FC Stegerman
2e080c8170 make F-Droid-specific changes to apksigcopier.py 2023-02-17 13:08:23 +00:00
FC Stegerman
c68e1489bd import apksigcopier v1.1.1 2023-02-17 13:08:23 +00:00
Hans-Christoph Steiner
4de2e3cf04 Merge branch 'windows' into 'master'
gitlab-ci: only run Windows job in branches called "windows

See merge request fdroid/fdroidserver!1301
2023-02-17 09:34:54 +00:00
Hans-Christoph Steiner
5cebb839d4 gitlab-ci: only run Windows job in branches called "windows 2023-02-17 09:34:30 +00:00
Hans-Christoph Steiner
01bddc98f1 Merge branch 'python_dist' into 'master'
Fix l10n broken in venvs, stop packaging makebuildserver script

Closes #1014

See merge request fdroid/fdroidserver!1167
2023-02-16 21:21:38 +00:00
FestplattenSchnitzel
ac9b20f6ab gitlab-ci: check that localization works when installed with pip 2023-02-16 21:07:36 +00:00
FestplattenSchnitzel
beb49eea48 Stop packaging makebuildserver script
makebuildserver requires this repository to be cloned locally.
Fixes #1014.
2023-02-16 21:07:36 +00:00
FestplattenSchnitzel
ada36a3ee5 Fix l10n broken in venvs 2023-02-16 21:07:36 +00:00
Hans-Christoph Steiner
92556e4cd0 Merge branch 'v2_video' into 'master'
v2: move video to translated text (Closes: #1095)

Closes #1095

See merge request fdroid/fdroidserver!1293
2023-02-16 20:59:51 +00:00
Hans-Christoph Steiner
b697845bda add test case for index.package_metadata() 2023-02-16 21:45:39 +01:00
Jochen Sprickerhof
0f151a3779 v2: move video to translated text (Closes: #1095)
It contains a link to the actual video and can be translated.
2023-02-16 21:42:09 +01:00
Jochen Sprickerhof
b1ad5cd4fd Merge branch 'fix_path' into 'master'
common: support PosixPath in log message

See merge request fdroid/fdroidserver!1300
2023-02-16 20:09:56 +00:00
Jochen Sprickerhof
04230dc7c0
common: support PosixPath in log message 2023-02-16 15:17:14 +01:00
Jochen Sprickerhof
7e362a708c Merge branch 'fix_path' into 'master'
build: support PosixPath in log message (Closes #1096)

Closes #1096

See merge request fdroid/fdroidserver!1298
2023-02-16 13:48:24 +00:00
Jochen Sprickerhof
fef42dbc87
build: support PosixPath in log message (Closes: #1096) 2023-02-16 14:29:31 +01:00
Jochen Sprickerhof
c9095134cd Merge branch 'binary' into 'master'
Add build.binary

See merge request fdroid/fdroidserver!1291
2023-02-16 12:30:17 +00:00
linsui
58f167b7e5 Add build.binary 2023-02-16 20:16:52 +08:00
Jochen Sprickerhof
68e27c0a9b Merge branch 'postbuild' into 'master'
Add postbuild

Closes #1069

See merge request fdroid/fdroidserver!1281
2023-02-16 12:11:26 +00:00
linsui
33def096f5 Add postbuild 2023-02-16 12:11:26 +00:00
Hans-Christoph Steiner
2ffb70168a Merge branch 'gradle-release-checksums.py' into 'master'
update to gradle v8.0

See merge request fdroid/fdroidserver!1296
2023-02-16 09:05:47 +00:00
fdroid-bot
fd54633f52 gradle v8.0 2023-02-16 08:38:19 +00:00
Jochen Sprickerhof
dc9be512e2 Merge branch 'fix_path' into 'master'
Fix pathlib usage

See merge request fdroid/fdroidserver!1297
2023-02-16 08:37:35 +00:00
Jochen Sprickerhof
ecfbdef60f
Fix pathlib usage
Regression from 4a581bdf.
2023-02-16 09:23:07 +01:00
Jochen Sprickerhof
0e07dd0501 Merge branch 'sbr/python3.6' into 'master'
Remove path workarounds for old python versions

See merge request fdroid/fdroidserver!1276
2023-02-15 19:25:48 +00:00
Simon Brand
4a581bdfb6 Remove path workarounds for old python versions 2023-02-15 19:25:48 +00:00
Hans-Christoph Steiner
c5ba4bc848 Merge branch 'fix_vagrantfile' into 'master'
Set vm_provider in example Vagrantfile.yaml

See merge request fdroid/fdroidserver!1277
2023-02-08 21:17:23 +00:00
Jochen Sprickerhof
629b2650d0 makebuildserver: make sure config is a dict
yaml.safe_load returns None for an empty file.
2023-02-08 21:17:12 +00:00
Hans-Christoph Steiner
84dd97e007 Merge branch 'purge_travis_ci' into 'master'
Remove references to Travis CI, clean up README

See merge request fdroid/fdroidserver!1284
2023-02-08 21:03:17 +00:00
FestplattenSchnitzel
1074b5938d
README: Remove CI/CD status section 2023-02-08 21:49:03 +01:00
FestplattenSchnitzel
406652988a
Remove references to Travis CI
We do not use it any longer.
2023-02-08 21:48:45 +01:00
Hans-Christoph Steiner
375f68480c Merge branch 'fix_fedora_ci' into 'master'
CI: Add missing dependency on Fedora

See merge request fdroid/fdroidserver!1263
2023-02-08 17:34:01 +00:00
Jochen Sprickerhof
6118925387 Skip nightly test on Fedora with pip in $HOME 2023-02-08 18:32:13 +01:00
Hans-Christoph Steiner
b293252029 Merge branch 'rework_unittests' into 'master'
Rework unittests

See merge request fdroid/fdroidserver!1269
2023-02-08 17:29:01 +00:00
Jochen Sprickerhof
5715e377b0 nightly test: cleaup test directory 2023-02-08 18:14:38 +01:00
Jochen Sprickerhof
55c3a28568 run-tests: make mirror test independent of update test 2023-02-08 18:14:38 +01:00
Jochen Sprickerhof
a667074d89 run-tests: make scanner test independent on importer test 2023-02-08 18:14:38 +01:00
Jochen Sprickerhof
b1fca3f722 run-tests: always cleanup testfiles 2023-02-08 18:14:38 +01:00
Jochen Sprickerhof
6ba40b7349 common tests: use patch.dict for os.environ 2023-02-08 18:14:36 +01:00
Jochen Sprickerhof
d29a486e31 tests: use context manager and/or standard setup temp files 2023-02-08 18:12:35 +01:00
Jochen Sprickerhof
1eeb992118
Don't create unused testfiles directory 2023-02-06 14:52:35 +01:00
Jochen Sprickerhof
d5400549f6
update test: set update options 2023-02-06 14:52:35 +01:00
Jochen Sprickerhof
4a6ccae71a
install_ndk: cleanup tempdir 2023-02-06 14:52:32 +01:00
Hans-Christoph Steiner
b285603e43 Merge branch 'destroy_vm' into 'master'
build: close ssh_channel upon timeout

See merge request fdroid/fdroidserver!1287
2023-02-06 11:12:28 +00:00
Jochen Sprickerhof
a6700e65ed build: close ssh_channel upon timeout
The build can get stuck when running into the timeout and paramiko not
noticing it. This can be reproduced by setting a small build timeout for
an app. I tried setting set_keepalive() but it did not help. This
forcefully closes the ssh channel to the VM so the fdroid build will
continue. As we destroy the VM in the next step anyhow I think this is
fine.
2023-02-04 10:14:03 +00:00
Jochen Sprickerhof
5e08187567 build: Rename chan to ssh_channel 2023-02-04 10:14:03 +00:00