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

8633 Commits

Author SHA1 Message Date
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
relan
ddfbd1cc47 build: fix directories removal
The 'dirs' array contains a single-level listing of a directory, e. g.
['app', 'build', 'build.gradle', 'gradle', '.gradle']. Multi-component
paths like 'build/tmp' could never be found in this array and thus were
never removed.

Call shutil.rmtree() without checking that the argument is in 'dirs'. If
it exists and is a directory, it'll be removed. Otherwise shutil.rmtree()
will do nothing.
2020-05-26 07:37:20 +00:00
Marcus Hoffmann
68c072c72e Revert "scanner: add --json option for outputting machine readable results"
This reverts commit cdaf62e5d9.

See: https://gitlab.com/fdroid/fdroidserver/-/merge_requests/748#note_347769371
2020-05-24 10:24:40 +02:00
Hans-Christoph Steiner
1be8788f5f Merge branch 'scanner-json' into 'master'
`fdroid scanner --json` for machine readable output

See merge request fdroid/fdroidserver!748
2020-05-19 21:18:39 +00:00
Marcus Hoffmann
e25b8a1933 add gradle 6.4.1 2020-05-17 02:58:30 +02:00
Hans-Christoph Steiner
cdaf62e5d9 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
2020-05-14 21:58:48 +02:00
Hans-Christoph Steiner
a0e3b01e94 metadata: parsed srclibs must always return a dict as the container 2020-05-14 16:28:13 +02:00
Hans-Christoph Steiner
410901d3bd Merge branch 'yamllint' into 'master'
yamllint

See merge request fdroid/fdroidserver!721
2020-05-14 12:36:19 +00:00
Michael Pöhn
0945eadd4f Apply suggestion to buildserver/provision-apt-get-install 2020-05-14 11:11:01 +00:00
Michael Pöhn
90f3e1ab70 Merge branch 'hopefully-uncontroversial-fixes' into 'master'
hopefully uncontroversial fixes

See merge request fdroid/fdroidserver!746
2020-05-14 11:05:58 +00:00
Hans-Christoph Steiner
df563d339a
fix pep8 E741 ambiguous variable name 'l' 2020-05-14 12:11:36 +02:00
Hans-Christoph Steiner
1106795583 deploy: stop uploading to androidobservatory if its already up there 2020-05-14 11:55:09 +02:00
Hans-Christoph Steiner
30f2d62597 import: fix --omit-disable flag, its a boolean 2020-05-14 11:55:09 +02:00
Hans-Christoph Steiner
ba854ab24a support Cordova's gradle file
https://cordova.apache.org/docs/en/latest/guide/platforms/android/index.html
2020-05-14 11:55:09 +02:00
Hans-Christoph Steiner
77367f1bff server: disable extraneous HTTP errors in upload_apk_to_virustotal
This should be in the lowest level so that both the low level call,
upload_apk_to_virustotal(), and the next level up, upload_to_virustotal(),
both inherit this.
2020-05-14 11:55:09 +02:00
Hans-Christoph Steiner
cfa88a5335 gitlab-ci: fix binfmt support for focal to run apksigner
This manually mounts the binfmt_misc dir if its not present.
It seems the Ubuntu/focal release stopped auto-mounting binfmt_misc:
https://bugs.launchpad.net/binfmt-support/+bug/1878413
2020-05-14 11:55:09 +02:00
Hans-Christoph Steiner
72e85bcccf Merge branch 'ndk-r21b' into 'master'
Upgrade NDK r21 to r21b

See merge request fdroid/fdroidserver!747
2020-05-14 08:08:36 +00:00
relan
13ac46af07 makebuildserver: upgrade NDK r21 to r21b 2020-05-14 08:43:33 +03:00
Hans-Christoph Steiner
bed0653657 Merge branch 'fix-lint-gitlab-ci-job' into 'master'
Fix lint gitlab ci job

See merge request fdroid/fdroidserver!743
2020-05-11 16:05:44 +00:00
Hans-Christoph Steiner
0700242416 gitlab-ci: use latest pylint to avoid safety error about vuln 2020-05-11 17:45:33 +02:00
Hans-Christoph Steiner
052e22284b gitlab-ci: show clear error message when one step of job fails 2020-05-11 17:40:21 +02:00
Hans-Christoph Steiner
169d551683 Merge branch 'archive-fix' into 'master'
Fix nightly --archive-older command line option

See merge request fdroid/fdroidserver!744
2020-05-11 15:32:04 +00:00
Torsten Grote
db96753902
Fix nightly --archive-older command line option 2020-05-11 10:23:26 -03:00