Marcus Hoffmann
294799e2f5
scanner: fix options handling
...
closes fdroid/fdroidserver#789
2020-06-11 11:44:00 +02:00
Marcus
0e025e2ae9
Merge branch 'scanner-overhaul' into 'master'
...
scanner file type overhaul
Closes #394
See merge request fdroid/fdroidserver!758
2020-06-11 09:23:39 +00:00
Marcus
95623361ae
Merge branch 'master' into 'master'
...
Update NDK to r21d and add buildtools 30.0.0
See merge request fdroid/fdroidserver!763
2020-06-10 20:21:26 +00:00
TacoTheDank
07992177bf
Add build tools 30.0.0
2020-06-10 15:59:04 -04:00
TacoTheDank
0216513da6
Upgrade NDK r21c to r21d
2020-06-10 15:55:53 -04:00
Hans-Christoph Steiner
0837289935
scanner: fix regex for matching URLs in gradle maven{} blocks
...
closes #465
This script generated gradle-maven-blocks.yaml:
```python
import os
import re
import yaml
pat = re.compile(r'\smaven\s*{[^}]+}')
finds = set()
for root, dirs, files in os.walk('.'):
for f in files:
if '.gradle' in f:
with open(os.path.join(root, f), errors='surrogateescape') as fp:
contents = fp.read()
for m in pat.findall(contents):
finds.add(m)
with open('finds.yaml', 'w') as fp:
yaml.dump(sorted(finds), fp, default_flow_style=False)
```
2020-06-10 19:42:23 +02:00
Hans-Christoph Steiner
6590f3869e
scanner: error/warn on dex/gz/zip, closes #394
2020-06-10 19:42:23 +02:00
Hans-Christoph Steiner
d7b3bca1e7
build: pass --verbose flag through to scanner
2020-06-10 19:42:23 +02:00
Hans-Christoph Steiner
ee54dbce87
scanner: safely check options, for things using this API
...
https://gitlab.com/fdroid/fdroidserver/-/issues/771#note_353495799
2020-06-10 19:42:23 +02:00
Hans-Christoph Steiner
75acf63efa
scanner: remove all gradle wrapper files
2020-06-10 19:42:23 +02:00
Hans-Christoph Steiner
2f5d780c49
scanner: always setup JSON data structure so functions work as API
2020-06-10 19:42:23 +02:00
Hans-Christoph Steiner
84f225f2f2
scanner: make problem descriptions translationable
2020-06-10 19:42:23 +02:00
Hans-Christoph Steiner
d898ad0412
scanner: make AARs and JARs trigger an error
...
refs #491
2020-06-10 19:42:23 +02:00
Hans-Christoph Steiner
3bc246ccad
scanner: ignore well known image types that are set executable
2020-06-10 19:42:23 +02:00
Hans-Christoph Steiner
83edb5b80a
Merge branch 'plugin-system' into 'master'
...
Plugin system
See merge request fdroid/fdroidserver!709
2020-06-10 17:36:02 +00:00
Michael Pöhn
a97b3ca4dd
implement plugin system review suggestsions
2020-06-10 18:43:23 +02:00
Michael Pöhn
77167e098e
plugin system: regex instead of import bases plugin parsing
2020-06-10 18:43:11 +02:00
Michael Pöhn
b257a3411a
stick to default python sys.path
2020-06-10 12:11:47 +02:00
Michael Pöhn
3a3803ea2d
raise excepten when starting broken plugin
2020-06-10 12:11:47 +02:00
Michael Pöhn
bf815251ec
rough plugin system implementation
2020-06-10 12:11:47 +02:00
Michael Pöhn
32f09603e1
Merge branch 'move-tests-to-yaml' into 'master'
...
move tests to YAML
See merge request fdroid/fdroidserver!761
2020-06-10 10:04:36 +00:00
Hans-Christoph Steiner
bde65aa54d
gitlab-ci: switch metadata_v0 test to commit that supports only .yml
...
37f37ebd88
2020-06-10 10:44:27 +02:00
Hans-Christoph Steiner
0d1fddb82e
convert inline tests to .yml
2020-06-10 10:43:27 +02:00
Hans-Christoph Steiner
f0fb3b64f8
remove obselete tests
2020-06-10 10:43:25 +02:00
Hans-Christoph Steiner
37f37ebd88
use default accepted_formats since all the files are .yml anyway
2020-06-10 10:43:21 +02:00
Hans-Christoph Steiner
1b90aec697
purge .txt and .json from bash-completion
...
YAML is the way!
2020-06-10 09:56:33 +02:00
Hans-Christoph Steiner
b63e9e68c5
move all test metadata files to .yml format
...
for f in metadata/*.txt; do ../fdroid rewritemeta --to yml $(basename $f | sed 's,\.txt,,'); done
2020-06-10 09:56:31 +02:00
Marcus
3bf2d60bfa
Merge branch 'fix_783' into 'master'
...
strip_and_copy_image: abort on broken symlinks
Closes #783
See merge request fdroid/fdroidserver!760
2020-06-04 11:20:43 +00:00
Marcus Hoffmann
581e433832
strip_and_copy_image: abort on broken symlinks
...
Also guard against other processes removing the files we are about to
copy.
closes fdroid/fdroidserver#783
2020-06-04 12:58:11 +02:00
Marcus Hoffmann
4c69411387
add gradle 6.5
2020-06-04 00:30:30 +02:00
Marcus
0d609b4b1e
Merge branch 'validate-string-int-types' into 'master'
...
metadata: validate STRING and INT build field types
See merge request fdroid/fdroidserver!752
2020-06-03 22:03:37 +00:00
Hans-Christoph Steiner
13d9a122bf
metadata: validate STRING and INT build field types
...
This converts float/int to string for things like commit: or versionName:.
For versionCode, which must be an integer, it throws an exception if the
data is any other type.
2020-06-02 22:06:01 +02:00
Hans-Christoph Steiner
b2daf96284
lint: fix pyflakes
2020-06-02 22:05:18 +02:00
Hans-Christoph Steiner
b1eb086259
Merge branch 'patch-2' into 'master'
...
Add NDK r21c
See merge request fdroid/fdroidserver!755
2020-06-02 19:59:38 +00:00
Hans-Christoph Steiner
6c5887e906
lint: make --force-yamllint error if yamllint is not installed
...
https://gitlab.com/fdroid/fdroidserver/-/merge_requests/753#note_353829401
2020-06-02 21:56:05 +02:00
Hans-Christoph Steiner
83e0693231
update lint bash-completion: -f --format --force-yamllint
2020-06-02 21:56:00 +02:00
Marcus
7eee72a342
Merge branch 'pile-o-2.0-bugfixes' into 'master'
...
Pile o' 2.0 bugfixes
Closes #719
See merge request fdroid/fdroidserver!753
2020-06-02 16:30:46 +00:00
Marcus
a6814899ad
Merge branch 'agp_4.0' into 'master'
...
add AGP 4.0
See merge request fdroid/fdroidserver!757
2020-06-02 11:58:37 +00:00
Marcus Hoffmann
cfff954782
add AGP 4.0
2020-06-02 13:37:29 +02:00
TacoTheDank
edd41b3c58
Upgrade NDK r21b to r21c
2020-05-29 16:23:20 -04:00
Hans-Christoph Steiner
7a84679b0d
gradlew-fdroid: fix parsing when files have Windows linefeeds
...
The new test file should have Windows linefeeds, if I got the git config
correct.
2020-05-29 21:55:10 +02:00
Hans-Christoph Steiner
fc885c9b5c
scanner: test for get_gradle_compile_commands()
2020-05-27 22:09:52 +02:00
Hans-Christoph Steiner
1ed4ed61c7
buildserver: explicitly include sudo as a dependency
...
The basebox currently provides sudo, but that may not always be the case.
This makes the sudo dependency explicit, so that this provisioning script
can also be used in other settings, like GitLab CI.
2020-05-27 22:09:52 +02:00
Hans-Christoph Steiner
cc5aed3c1f
fix version codes in bash completion for fdroid build
...
I'm not sure the old code ever worked, but this works now, and supports
.yml.
closes #719
2020-05-27 22:09:52 +02:00
Hans-Christoph Steiner
95c3ab2454
skip yamllint test if yamllint is not installed
...
!721
2020-05-27 22:07:17 +02:00
Hans-Christoph Steiner
67332d83a5
scanner: add --json option for outputting machine readable results
...
* makes per-build entries in per-app entries
* `fdroid scanner --json --verbose` will output logging messages to stderr
* removed " at line N" from one message to make them uniform keys
* this will be used in issuebot
This is a second attempt with tests for how `fdroid build` calls the
scanner functions. closes #771 . It was previously merged in !748 then
reverted in 68c072c72e
2020-05-27 08:35:14 +02:00
Hans-Christoph Steiner
6030445be0
logging.warn() was deprecated in Python 3.3, use logging.warning()
...
sed -i 's,logging\.warn(,logging.warning(,g' fdroid */*.*
https://docs.python.org/3.3/library/logging.html#logging.Logger.warning
2020-05-27 08:35:14 +02:00
Hans-Christoph Steiner
dec6b9deed
Merge branch 'gradle-clean' into 'master'
...
* gradle-clean:
add test for things `fdroid build` cleans
build: clean buildSrc/build
build: fix directories removal
See merge request fdroid/fdroidserver!750
2020-05-26 09:49:42 +02:00
Hans-Christoph Steiner
5b9944fcde
add test for things fdroid build
cleans
...
This needs a lot of mocking because build.build_local() is a
gianormous single function.
2020-05-26 09:48:55 +02:00
relan
9ff77cfd1a
build: clean buildSrc/build
...
The buildSrc directory contains custom build logic written in Kotlin.
Before this change we had to 'scandelete' buildSrc/build in the build
recipes becase 'gradle clean' leaves binary artifacts there.
2020-05-26 07:37:20 +00:00