ab2291475b
import: mv reusable functions to common.py to avoid import_proxy.py
...
import is a strict keyword in Python, so it is not possible to import a
module called 'import', even with things like:
* import fdroidserver.import
* from fdroidserver import import
2020-03-11 13:41:13 +01:00
87e825bf3e
add gradle 6.2.2
2020-03-10 16:58:41 +01:00
9d4f0f6712
Merge branch 'less_pedandic_checks' into 'master'
...
opencollecive: fix allowed characters
See merge request fdroid/fdroidserver!724
2020-03-10 15:49:50 +00:00
56ee7fe765
opencollecive: fix allowed characters
...
The url slug used by opencollective allows case variations, they all
lead back to the canonical lowercase variant though.
Apart from ascii characters and numbers only - and _ are allowed.
2020-03-10 16:26:34 +01:00
c6e68c11f8
Merge branch 'opencollective' into 'master'
...
add opencollective metadata and index field
See merge request fdroid/fdroidserver!720
2020-03-10 14:56:03 +00:00
9d24f2e4a7
add opencollective metadata and index field
2020-03-10 14:56:03 +00:00
b8ddc43f95
Merge branch 'libvirt' into 'master'
...
libvirt: various fixes related to the `makebuildserver` and `fdroid build` commands
See merge request fdroid/fdroidserver!718
2020-03-09 15:06:19 +00:00
2d63ab66f5
libvirt: various fixes related to the `makebuildserver` and `fdroid build` commands
2020-03-09 15:06:19 +00:00
5e0c8d5a46
Merge branch 'nightly-stats' into 'master'
...
Add stats support to nightly repo
See merge request fdroid/fdroidserver!722
2020-03-03 14:30:28 +00:00
14208a6761
Add stats support to nightly repo
...
This will keep track of when APKs were added
and show these dates properly in the client
instead of always resetting all dates to the latest update.
2020-03-02 14:17:42 -03:00
b5ec4af54b
Merge branch 'gradle_6.2' into 'master'
...
add gradle 6.2{,.1} and AGP 3.6
See merge request fdroid/fdroidserver!719
2020-02-25 12:10:11 +00:00
b4720665b9
add gradle 6.2{,.1} and AGP 3.6
2020-02-25 12:46:47 +01:00
ed46afe262
gitlab-ci: ensure git is installed for pip_install job
2020-02-20 16:40:31 +01:00
b5bce9f178
build: do not write/rsync status JSON when running --on-server
...
!717 !716
2020-02-20 16:40:19 +01:00
7b8d358833
Merge branch 'status-json-fixes' into 'master'
...
Status json fixes
Closes #741 and #742
See merge request fdroid/fdroidserver!717
2020-02-19 21:06:56 +00:00
b6e6ce87cb
build: has no pretty option ( closes #742 )
2020-02-19 20:29:54 +01:00
21f5bd73a7
build: fix logging failed builds to the status JSON ( closes #741 )
2020-02-19 20:29:51 +01:00
28117f31d3
Merge branch 'write-status-json' into 'master'
...
write buildserver status as public JSON files
See merge request fdroid/fdroidserver!716
2020-02-19 14:21:23 +00:00
202291d66c
integration test for creating and deploying status JSON files
...
----------------------------
2020-02-19 14:50:37 +01:00
bf6004b08e
rsync status JSON as first and last steps of command runs
2020-02-19 14:50:35 +01:00
c19ef45fd5
build: write status JSON
2020-02-19 14:50:32 +01:00
55935d9a41
signindex: write status JSON
2020-02-19 14:50:30 +01:00
c965e7d969
deploy: write status JSON
2020-02-19 14:50:29 +01:00
ddbdff83bd
gpgsign: write status JSON
2020-02-19 14:50:26 +01:00
4bb590b6e5
publish: write status JSON
2020-02-19 14:50:24 +01:00
e8a6d0f813
checkupdates: write status JSON
2020-02-18 23:45:52 +01:00
d16478b10b
update: write status in JSON repo file, using new internal API
2020-02-18 23:45:48 +01:00
5459a461db
common.get_head_commit_id() to get string commit ID from HEAD
2020-02-18 23:16:53 +01:00
fafaa8f81f
standardize on path.endswith() for file extension checks
...
Its already widely used, this just removes the exceptions. It is also more
Pythonic
2020-02-18 23:16:51 +01:00
202602937d
import: ignore results if build/appid dir already exists
2020-02-18 23:16:49 +01:00
32a29b3304
import: get git commit ID from git repo, e.g. master instead of '?'
2020-02-18 23:16:44 +01:00
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
271b74af7d
fix remove_signing_keys() for Kotlin gradles files (*.gradle.kts)
2020-02-13 22:32:51 +01:00
68b793e308
support kotlin "*.gradle.kts" files in more places
...
closes #613
2020-02-13 22:32:51 +01:00
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
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
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
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
1408e486dc
Merge branch 'overhaul-import' into 'master'
...
Overhaul `fdroid import`
See merge request fdroid/fdroidserver!714
2020-02-13 21:31:45 +00:00
ad92b4c678
scanner: add --force option for scanning disabled apps/builds
2020-02-13 13:58:13 +01:00
e037ee5972
import: generate skeleton build fields for react-native and flutter
2020-02-13 13:51:52 +01:00
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
e9a6c84efd
import: split URL parsing from code cloning
...
This makes things testable and easier to follow.
2020-02-13 13:51:52 +01:00
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
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
697a0641f1
fix sudo syntax from 7a1fa6e857
...
fdroid/fdroidserver!713
2020-02-11 19:44:18 +01:00
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
bfe8f05de6
fix syntax error from ae86dc3d38
...
fdroid/fdroidserver!713
[skip ci]
2020-02-11 12:48:42 +01:00
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
a746917022
provision-gradle: disable daemon and block HTTP repos
...
closes #624
#712
2020-02-05 20:36:25 +01:00
Hans-Christoph Steiner