Hans-Christoph Steiner
d8f3d94997
gitlab-ci: remove dscanner exclusions from bandit
2020-01-31 15:37:28 +01:00
Hans-Christoph Steiner
28aa404c24
Merge branch 'remove_drozer' into 'master'
...
remove dscanner subcommand
See merge request fdroid/fdroidserver!711
2020-01-31 13:50:07 +00:00
Marcus Hoffmann
8961485125
remove dscanner subcommand
...
It's unused and unmaintained. It could potentially be revived as a
plugin at a later point.
2020-01-31 14:17:12 +01:00
Hans-Christoph Steiner
da24a45e83
Merge branch 'main-script-tests' into 'master'
...
Main script tests
See merge request fdroid/fdroidserver!708
2020-01-28 11:03:07 +00:00
Michael Pöhn
f2a80ffa3d
fix tests on old python version
2020-01-28 11:43:09 +01:00
Michael Pöhn
b25eeb66a1
fix code style
2020-01-28 11:43:09 +01:00
Michael Pöhn
69fc38c668
repair fdroid --version
2020-01-28 11:43:09 +01:00
Michael Pöhn
f21481ca81
add some simple tests for main
2020-01-28 11:43:09 +01:00
Michael Pöhn
7a4254efa2
make main script pythonic
2020-01-28 11:43:09 +01:00
Marcus Hoffmann
09db493557
gradlew-fdroid: support parsing files with no EOL before EOF
...
Fixes cases like: https://gitlab.com/fdroid/fdroiddata/merge_requests/6216#note_273985937
2020-01-21 11:15:51 +01:00
Marcus
7683179e84
Merge branch 'gradle61' into 'master'
...
Add Gradle 6.1
Closes #730
See merge request fdroid/fdroidserver!706
2020-01-19 18:46:52 +00:00
Licaon_Kter
33ddf944f3
Add Gradle 6.1
2020-01-19 18:46:52 +00:00
Marcus Hoffmann
fdcb1ad23f
Revert "Revert "Merge branch 'ndk21' into 'master'""
...
This reverts commit 999b15a909
.
2020-01-15 22:48:40 +01:00
Marcus Hoffmann
999b15a909
Revert "Merge branch 'ndk21' into 'master'"
...
This reverts commit 9b4cb8b76a
, reversing
changes made to 3bdbbfd45b
.
2020-01-15 22:09:41 +01:00
Marcus
9b4cb8b76a
Merge branch 'ndk21' into 'master'
...
Add NDK21
See merge request fdroid/fdroidserver!705
2020-01-15 12:28:36 +00:00
Licaon_Kter
3c3b3dbcf2
Add NDK21
2020-01-15 12:28:36 +00:00
Marcus
3bdbbfd45b
Merge branch 'longer_titles' into 'master'
...
bump title char_limit to 50
Closes fdroiddata#1906 and #726
See merge request fdroid/fdroidserver!702
2020-01-14 13:54:41 +00:00
Michael Pöhn
9a8718c189
Merge branch 'deploy-fixes' into 'master'
...
`fdroid deploy` fixes
See merge request fdroid/fdroidserver!703
2020-01-14 11:02:51 +00:00
Hans-Christoph Steiner
df7d7adf78
mirror: optionally fetch build logs and src tarballs
2020-01-14 11:36:11 +01:00
Hans-Christoph Steiner
e76a0c9d6a
git_mirror_size_limit config option to set max git mirror size
...
GitHub and GitLab have some kinds of limits on how big a git repo can be,
this makes that option configurable. This also is very useful for tests.
2020-01-14 11:36:08 +01:00
Hans-Christoph Steiner
4fa11ef4fc
deploy: detect virustotal size limits while uploading
...
This prevents the size limits from blocking the whole deploy.
2020-01-14 11:19:02 +01:00
Hans-Christoph Steiner
058b47e484
deploy: fix virustotal report fetching, use GET and query string
2020-01-14 11:19:00 +01:00
Hans-Christoph Steiner
f2b48575e6
deploy: github/gitlab use bare git repos, only size the .git/ dir
...
needs test: generate giant APKs by including AndroidManifest.xml and and
large file from /dev/urandom, then sign it. Then add those to the git repo.
2020-01-14 11:18:53 +01:00
Marcus Hoffmann
96ba194d65
bump title char_limit to 50
...
This follows google play in doing so.
Closes fdroidserver#726, fdroid/fdroiddata#1906 .
2020-01-08 14:20:18 +01:00
Hans-Christoph Steiner
098bce2134
Merge branch 'git_fetch_force_tags' into 'master'
...
git force fetch tags
Closes #718
See merge request fdroid/fdroidserver!699
2020-01-02 13:45:22 +00:00
Hans-Christoph Steiner
ded5d8c6ac
Merge branch 'bugfix/auto-update-suffix' into 'master'
...
AutoUpdateMode: Do not include + in suffix
Closes #700 and #248
See merge request fdroid/fdroidserver!661
2020-01-02 13:27:12 +00:00
Gerhard Olsson
cf9bff1d56
AutoUpdateMode: Do not include + in suffix
...
Add suffix to version only
2020-01-02 13:27:12 +00:00
Marcus
619ccb8d5a
Merge branch 'keep_cv' into 'master'
...
keep CVC of an app out of the archive
Closes #385
See merge request fdroid/fdroidserver!701
2020-01-01 14:48:28 +00:00
Marcus Hoffmann
83526e09a3
update: fix unarchiving of allowed disabled algorithm
...
6d0b1bbe6fae0909683f2c6a154515bc4bfcb674 didn't handle the
allow_disabled_algorithm case at all, so we add it back.
This additionally fixes a (previously existing) bug where setting
allow_disabled_algorithms to True didn't move apks back from archive to
repo. Introduce a new test for this.
The disabled_algorithm archiving logic is still all over the place so
ideally that needs a future refactor.
2020-01-01 15:25:43 +01:00
Marcus Hoffmann
a7a83e1ee3
update: keep CVC of an app out of the archive
...
We want to keep the stable version (CV) of an app in /repo with highest
priority and only move it to /archive when ArchivePolicy is set to 0.
For this to work we need two changes here:
1) when sorting apks by version code we insert the apk corresponding to
the CVC of the app afterwards with highest priority. So when walking the
list of apks afterwards the CVC apk is always kept first.
2) Instead of the two pass algorithm of moving things back and forth to
the archive we instead figure out where each apk of an app goes in first
before actually moving them into the right place.
Fixes : fdroid/fdroidserver#385
2020-01-01 15:25:43 +01:00
Marcus Hoffmann
7f6efa74f5
tests: add test for correctly handling CVC when archiving
2019-12-24 17:35:54 +01:00
Marcus Hoffmann
3403402fbc
git force fetch tags
...
The behaviour of fetching tags changed in git 2.20. We need to force
fetch tags to restore the earlier behaviour and make fdroid git
operations work with newer git versions.
Closes fdroid/fdroidserver#718
2019-12-23 14:48:52 +01:00
Hans-Christoph Steiner
e9830fc4ab
Merge branch 'faster_yaml' into 'master'
...
metadata: use yaml C implementation when available
Closes #716
See merge request fdroid/fdroidserver!696
2019-12-23 10:09:50 +00:00
Marcus Hoffmann
01d00d54ca
metadata: use yaml C implementation when available
...
This is an order of magnitude faster. Requires the C yaml bindings to be
installed.
Fixes fdroid/fdroidserver#716
2019-12-23 01:59:33 +01:00
Marcus
bc4655f437
Merge branch 'remove_unused_function' into 'master'
...
remove unused function
See merge request fdroid/fdroidserver!697
2019-12-23 00:52:18 +00:00
Marcus Hoffmann
5642dc56ae
remove unused function
...
The users of this were removed years ago in
013315bf10
.
2019-12-23 01:29:06 +01:00
Marcus
44694a0bc7
Merge branch 'ndk20b' into 'master'
...
Add NDK r20b
See merge request fdroid/fdroidserver!695
2019-12-16 00:07:03 +00:00
Licaon_Kter
126f6bf839
Add NDK r20b
2019-12-16 00:07:03 +00:00
Michael Pöhn
d2481375bb
Merge branch 'archive_description' into 'master'
...
archive description
See merge request fdroid/fdroidserver!694
2019-12-15 16:34:16 +00:00
Hans-Christoph Steiner
37ca21f6da
Merge branch 'hex_versionCode' into 'master'
...
* hex_versionCode:
checkupdates: split out vercode parsing into testable function
Add unit test for string_is_integer()
Support hex versionCode in build command line
Support hex in versionCode
See merge request fdroid/fdroidserver!692
2019-12-03 23:55:12 +01:00
Hans-Christoph Steiner
7d40e89341
checkupdates: split out vercode parsing into testable function
2019-12-03 23:51:48 +01:00
Jochen Sprickerhof
bbee2cf707
Add unit test for string_is_integer()
2019-12-03 21:49:44 +01:00
Hans-Christoph Steiner
492f12a7a8
nightly: set descriptions for repo and archive
2019-12-03 00:24:37 +01:00
Hans-Christoph Steiner
ddf1f8ea15
update: make default repo description translatable
2019-12-03 00:24:32 +01:00
Hans-Christoph Steiner
75639ba0e8
update: description is a hard requirement, set a default for archive
2019-12-03 00:23:56 +01:00
Jochen Sprickerhof
0e071a689d
Support hex versionCode in build command line
...
Example: fdroid build net.gaast.giggity:0x200
2019-11-29 20:02:24 +01:00
Jochen Sprickerhof
b83c3c9e18
Support hex in versionCode
...
Example: https://github.com/Wilm0r/giggity/blob/master/app/src/main/AndroidManifest.xml#L2
2019-11-29 20:01:29 +01:00
Michael Pöhn
4d9ec479a0
Merge branch 'gradle6' into 'master'
...
Gradle 6.0 & 6.0.1
Closes #710
See merge request fdroid/fdroidserver!691
2019-11-26 10:04:04 +00:00
Licaon_Kter
d0449d9713
Gradle 6.0 & 6.0.1
2019-11-26 10:04:04 +00:00
Hans-Christoph Steiner
1f363a889d
jenkins-setup-build-environment: auto-detect RAM/CPU specs
...
This lets this setup run on more basic hardware, like schweiger/vibi.
2019-11-18 18:14:11 +01:00