Hans-Christoph Steiner
ddafcb9f8a
Merge branch 'build-fixes' into 'master'
...
build fixes
Closes #613
See merge request fdroid/fdroidserver!715
2020-02-14 13:22:07 +00:00
Hans-Christoph Steiner
271b74af7d
fix remove_signing_keys() for Kotlin gradles files (*.gradle.kts)
2020-02-13 22:32:51 +01:00
Hans-Christoph Steiner
68b793e308
support kotlin "*.gradle.kts" files in more places
...
closes #613
2020-02-13 22:32:51 +01:00
Marcus Hoffmann
9ae41cc1ff
add support for gradle kotlin scripts
...
https://guides.gradle.org/migrating-build-logic-from-groovy-to-kotlin/
Closes fdroid/fdroidserver#613
cherry-picked from Bubu/fdroidserver@7d2e9f9c
2020-02-13 22:32:51 +01:00
Hans-Christoph Steiner
3de2d0f56f
add basic test suite for gradlew-fdroid
...
!707
fdroiddata#6216
The se.manyver app is licensed MPL, the files came from:
81d247a6cd
2020-02-13 22:32:51 +01:00
Hans-Christoph Steiner
83ffeb855f
prefer build.gradle with Android Plugin as source of package/version/code
...
These days, the location that overrides all the others is in the android{}
block of the build.gradle file that loads the com.android.application
plugin. So this should be the preferred place to read these values.
test files GPL licensed: https://github.com/Integreight/1Sheeld-Android-App
2020-02-13 22:32:51 +01:00
Hans-Christoph Steiner
d9722f4453
buildserver: use long timeouts for gradle downloads
...
default is 30 seconds, this uses 10 minutes to avoid things like:
* What went wrong:
A problem occurred configuring root project 'org.fdroid.fdroid'.
> Could not resolve all files for configuration ':classpath'.
> Could not download auto-value.jar (com.google.auto.value:auto-value:1.5.2)
> Could not get resource 'https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value/1.5.2/auto-value-1.5.2.jar '.
> Read timed out
* https://stackoverflow.com/a/49646993
* https://github.com/gradle/gradle/issues/4629#issuecomment-393182135
* https://github.com/gradle/gradle/pull/3371/files
2020-02-13 22:32:51 +01:00
Hans-Christoph Steiner
1408e486dc
Merge branch 'overhaul-import' into 'master'
...
Overhaul `fdroid import`
See merge request fdroid/fdroidserver!714
2020-02-13 21:31:45 +00:00
Hans-Christoph Steiner
ad92b4c678
scanner: add --force option for scanning disabled apps/builds
2020-02-13 13:58:13 +01:00
Hans-Christoph Steiner
e037ee5972
import: generate skeleton build fields for react-native and flutter
2020-02-13 13:51:52 +01:00
Hans-Christoph Steiner
1153ac24fd
import: overhaul URL validation to use urllib.parse
...
Python provides us a lovely URL parser with some level of validation built
in. The parsed URL is then much easier to validate.
2020-02-13 13:51:52 +01:00
Hans-Christoph Steiner
e9a6c84efd
import: split URL parsing from code cloning
...
This makes things testable and easier to follow.
2020-02-13 13:51:52 +01:00
Hans-Christoph Steiner
bfe587979d
import: make it work most of the time with git repos
...
This includes real tests too.
2020-02-13 13:51:52 +01:00
Hans-Christoph Steiner
e049a120f8
Merge branch 'gradlew_no_eol' into 'master'
...
gradlew-fdroid: support parsing files with no EOL before EOF
See merge request fdroid/fdroidserver!707
2020-02-13 09:47:07 +00:00
Hans-Christoph Steiner
697a0641f1
fix sudo syntax from 7a1fa6e857
...
fdroid/fdroidserver!713
2020-02-11 19:44:18 +01:00
Hans-Christoph Steiner
5a6422f4f3
jenkins-setup-build-environment: require 9GB RAM for 8GB VM
...
[skip ci] since this isn't used in gitlab-ci at all
2020-02-11 14:56:48 +01:00
Hans-Christoph Steiner
bfe8f05de6
fix syntax error from ae86dc3d38
...
fdroid/fdroidserver!713
[skip ci]
2020-02-11 12:48:42 +01:00
Hans-Christoph Steiner
e9ca4a17bc
Merge branch 'buildserver-fixes' into 'master'
...
random buildserver fixes
Closes #636 and #624
See merge request fdroid/fdroidserver!713
2020-02-10 16:37:50 +00:00
Hans-Christoph Steiner
a746917022
provision-gradle: disable daemon and block HTTP repos
...
closes #624
#712
2020-02-05 20:36:25 +01:00
Hans-Christoph Steiner
7a1fa6e857
build: keep DEBIAN_FRONTEND env var when running sudo: script
...
closes #636
2020-02-05 20:36:25 +01:00
Hans-Christoph Steiner
ae86dc3d38
buildserver: set quiet options to stop apt-get spamming build logs
...
https://gitlab.com/fdroid/fdroidserver/issues/636#note_266483988
2020-02-05 20:36:25 +01:00
Hans-Christoph Steiner
6b03f995be
deploy: check if file is on androidobservatory before uploading
...
Check if file is on androidobservatory before uploading.
androidobservatory.org redirects to a GET request after the POST, and
this seems to partially fail with requests. The checking code was
broken.
2020-02-05 20:34:03 +01:00
Hans-Christoph Steiner
5fb368916f
index: fix no JAR test case that fails on example.org
...
http://example.org/index-v1.jar now returns the HTTP header
"Content-Encoding: gzip" but then the reply is plain HTML. That
triggers a ContentDecodingError instead of an HTTPError, so this
changes the test to success on any RequestsException.
2020-02-05 20:33:40 +01:00
Marcus Hoffmann
25de42055e
gradlew-fdroid: update avaiable gradle versions and min versions
2020-02-05 20:21:33 +01:00
Hans-Christoph Steiner
77efdac41b
add Gradle 6.1.1 to gradlew-fdroid
...
https://gitlab.com/fdroid/fdroidserver/-/merge_requests/710#note_282313001
missing from 84c7f4db9b
[skip ci]
2020-02-05 20:18:39 +01:00
Hans-Christoph Steiner
140bd29c94
Merge branch 'random-bag-of-fies' into 'master'
...
random bag of fixes
Closes #719
See merge request fdroid/fdroidserver!710
2020-02-05 19:12:19 +00:00
Hans-Christoph Steiner
a086d0dd3a
Merge branch 'msappcenter' into 'master'
...
Add Microsoft Appcenter SDK to forbidden list
See merge request fdroid/fdroidserver!712
2020-02-04 09:40:13 +00:00
licaon-kter
135c92f3d0
Add Microsoft Appcenter SDK to forbidden list
2020-02-02 03:50:54 +02:00
Hans-Christoph Steiner
427856b5fd
tests: use same mirrors order in all tests
...
This makes it so running `../fdroid update --nosign --pretty` in tests/ no
longer creates a diff in the tests/*/index* files. It matches the order
set in tests/run-tests.
2020-01-31 15:38:10 +01:00
Hans-Christoph Steiner
84c7f4db9b
Add Gradle 6.1.1, replacing Gradle 6.1
2020-01-31 15:38:08 +01:00
Hans-Christoph Steiner
e6b2134d2e
makebuildserver: ensure vagrant share block symlinks to the host
...
* https://phoenhex.re/2018-03-25/not-a-vagrant-bug
* https://github.com/hashicorp/vagrant/pull/10792/files
2020-01-31 15:38:07 +01:00
Hans-Christoph Steiner
0fa1f91a23
gitlab-ci: long timeout and many retries for pip installs
2020-01-31 15:38:05 +01:00
Hans-Christoph Steiner
e5d8479033
only do bash completion on .yml files
...
closes #719
2020-01-31 15:38:04 +01:00
Hans-Christoph Steiner
5c82956561
mirror: make .asc downloading opt-in with --pgp-signatures
...
Lots of third party repos do not use .asc PGP signatures at all, so having
this optional prevents tons of 404 Not Found errors.
2020-01-31 15:38:02 +01:00
Hans-Christoph Steiner
82a4817e8a
fix field name errors in examples/template.yml
2020-01-31 15:38:01 +01:00
Hans-Christoph Steiner
6ce22bff56
update: strip newlines from name/summary/video entries
...
These entries are hardcoded as a single line in all the app stores, so
newlines should be stripped to get the data simple to use. This is in
contrast with the on-disk format for Fastlane and Triple-T, which includes
a newline in the title.txt and short_description.txt files. I think all
files in those systems are normalized to end in a newline.
2020-01-31 15:37:59 +01:00
Hans-Christoph Steiner
3b5e3a62a3
move getappname+getcvname to checkupdates, the only place they're used
2020-01-31 15:37:57 +01:00
Hans-Christoph Steiner
fdede914cd
tests: properly name CheckupdatesTest class
2020-01-31 15:37:32 +01:00
Hans-Christoph Steiner
3df276cc3c
fix all bandit B310 urllib_urlopen
...
"Audit url open for permitted schemes. Allowing use of ‘file:’’ or custom
schemes is often unexpected."
https://bandit.readthedocs.io/en/latest/blacklists/blacklist_calls.html#b310-urllib-urlopen
2020-01-31 15:37:30 +01:00
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