Commit Graph
5822 Commits
Author SHA1 Message Date
Torsten Grote 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
Marcus 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
Marcus Hoffmann b4720665b9 add gradle 6.2{,.1} and AGP 3.6 2020-02-25 12:46:47 +01:00
Hans-Christoph Steiner ed46afe262 gitlab-ci: ensure git is installed for pip_install job 2020-02-20 16:40:31 +01:00
Hans-Christoph Steiner b5bce9f178 build: do not write/rsync status JSON when running --on-server
!717 !716
2020-02-20 16:40:19 +01:00
Hans-Christoph Steiner 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
Hans-Christoph Steiner b6e6ce87cb build: has no pretty option (closes #742) 2020-02-19 20:29:54 +01:00
Hans-Christoph Steiner 21f5bd73a7 build: fix logging failed builds to the status JSON (closes #741) 2020-02-19 20:29:51 +01:00
Michael Pöhn 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
Hans-Christoph Steiner 202291d66c integration test for creating and deploying status JSON files
----------------------------
2020-02-19 14:50:37 +01:00
Hans-Christoph Steiner bf6004b08e rsync status JSON as first and last steps of command runs 2020-02-19 14:50:35 +01:00
Hans-Christoph Steiner c19ef45fd5 build: write status JSON 2020-02-19 14:50:32 +01:00
Hans-Christoph Steiner 55935d9a41 signindex: write status JSON 2020-02-19 14:50:30 +01:00
Hans-Christoph Steiner c965e7d969 deploy: write status JSON 2020-02-19 14:50:29 +01:00
Hans-Christoph Steiner ddbdff83bd gpgsign: write status JSON 2020-02-19 14:50:26 +01:00
Hans-Christoph Steiner 4bb590b6e5 publish: write status JSON 2020-02-19 14:50:24 +01:00
Hans-Christoph Steiner e8a6d0f813 checkupdates: write status JSON 2020-02-18 23:45:52 +01:00
Hans-Christoph Steiner d16478b10b update: write status in JSON repo file, using new internal API 2020-02-18 23:45:48 +01:00
Hans-Christoph Steiner 5459a461db common.get_head_commit_id() to get string commit ID from HEAD 2020-02-18 23:16:53 +01:00
Hans-Christoph Steiner 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
Hans-Christoph Steiner 202602937d import: ignore results if build/appid dir already exists 2020-02-18 23:16:49 +01:00
Hans-Christoph Steiner 32a29b3304 import: get git commit ID from git repo, e.g. master instead of '?' 2020-02-18 23:16:44 +01:00
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:
https://gitlab.com/staltz/manyverse/commit/81d247a6cd89399836778e9ee71f7a4373e16701
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