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

6624 Commits

Author SHA1 Message Date
relan
6d9410597b Upgrade NDK r22 to r22b 2021-04-07 12:12:04 +03:00
Hans-Christoph Steiner
38c18d42f8 Merge branch 'log_vcs_exception' into 'master'
Create log file for VCSException

See merge request fdroid/fdroidserver!895
2021-04-06 12:57:39 +00:00
Jochen Sprickerhof
df3b6ea65c Create log file for VCSException
In case there is a VCS error (git tag not found), create a log file in
the F-Droid repo so it is shown on the monitor (currently 404).
2021-04-06 12:45:41 +00:00
Hans-Christoph Steiner
81fb9d4d63 Merge branch 'disabled_failed' into 'master'
Excluded disabled metadata in failedBuilds

See merge request fdroid/fdroidserver!897
2021-04-06 09:56:39 +00:00
Jochen Sprickerhof
49a593ac5f Excluded disabled metadata in failedBuilds 2021-04-06 09:44:11 +00:00
Hans-Christoph Steiner
1b7f9d86b6 Merge branch 'fix-gitlab-url' into 'master'
gitlab-ci: fix broken download link for fdroiddata tarball

See merge request fdroid/fdroidserver!898
2021-04-06 08:54:07 +00:00
Hans-Christoph Steiner
9f60516fcb gitlab-ci: fix broken download link for fdroiddata tarball
fdroiddata!8730
fdroiddata!8732
rfp@f49178ea0aed808607f8d6d753285b101e53f0be
2021-04-06 10:41:59 +02:00
Hans-Christoph Steiner
cf1fa84c77
gitlab-ci: rm HTML index gen test from job, fails on stretch
```console
  Downloading 0d6598b1ce/slimit-0.8.1.zip (88kB)
Collecting tinycss2>=0.4 (from html5print->fdroidserver==2.1a0.dev0)
  Downloading 63bf697a7c/tinycss2-1.1.0-py3-none-any.whl
tinycss2 requires Python '>=3.6' but the running Python is 3.5.3
```
2021-04-06 10:23:17 +02:00
Hans-Christoph Steiner
2e1d11242e Merge branch 'mypy' into 'master'
Add a mypy run to the pipeline

See merge request fdroid/fdroidserver!884
2021-04-02 09:54:32 +00:00
Benedikt Brückmann
8f0712e89b Add a mypy run to the pipeline 2021-04-02 08:57:56 +00:00
Hans-Christoph Steiner
7e60acb259 Merge branch 'fix-fetchlibs-common-config-is-None' into 'master'
Fix common.config is None in fetchlibs

Closes #881

See merge request fdroid/fdroidserver!892
2021-04-01 10:32:52 +00:00
proletarius101
c70cc33d1d Fix common.config is None in fetchlibs 2021-03-26 14:52:29 +00:00
Hans-Christoph Steiner
20c299358d gitlab-ci: modernize ubuntu_lts_ppa job using updates to PPA
The PPA now provides apksigner that does not need binfmt, and defusedxml is
a hard Depends:.
2021-03-24 11:20:00 +01:00
Hans-Christoph Steiner
b5485ded64
skip test_find_apksigner_system_package_android_home if no apksigner 2021-03-23 23:29:50 +01:00
Hans-Christoph Steiner
d106f9988e Merge branch 'master' into 'master'
bug fix collection

See merge request fdroid/fdroidserver!890
2021-03-23 20:41:16 +00:00
Hans-Christoph Steiner
f811d44f06 jenkins-build-all: use $WORKSPACE var to find correct file to modify 2021-03-23 21:01:56 +01:00
Hans-Christoph Steiner
b69b95103e add complete tests for finding apksigner; fix minor detection bug
find_apksigner() was preferring the oldest valid version rather than the
newest.
2021-03-23 21:01:53 +01:00
Hans-Christoph Steiner
9135dfbeed verify: include diffoscope setup info in output JSON 2021-03-23 11:01:40 +01:00
Hans-Christoph Steiner
8b393189c1 include /etc/issue.net in status JSON to identify the base system 2021-03-23 11:01:40 +01:00
Hans-Christoph Steiner
ee84eb762c buildserver: SharedFoldersEnableSymlinksCreate: false 2021-03-23 11:01:40 +01:00
Hans-Christoph Steiner
4a8f3ebf55
jenkins-build-all: force-limit fdroid build to 6 hours
The jenkins admins have requested that the jobs have much shorter run
times.  Otherwise they will just force restart jenkins or reboot the box
when updates come, without waiting for the jobs to finish.
2021-03-23 10:44:47 +01:00
Hans-Christoph Steiner
6daf9197c2
jenkins-test: remove checkupdates; jenkins admins need short jobs 2021-03-23 10:44:30 +01:00
Hans-Christoph Steiner
2b6d9c185e Merge branch 'apksigner-first' into 'master'
switch to using apksigner by default, as much as possible

Closes #880 and admin#202

See merge request fdroid/fdroidserver!889
2021-03-22 22:55:40 +00:00
Hans-Christoph Steiner
67e65ce2ea purge complete-ci-tests, those are better covered in .gitlab-ci.yml 2021-03-22 23:36:04 +01:00
Hans-Christoph Steiner
93ca13fa16 run-tests: remove broken test that never ran due to a syntax error 2021-03-22 22:31:29 +01:00
Hans-Christoph Steiner
7ec2a8ebb3 add apksigner, jarsigner, and keytool to relevant status JSON 2021-03-22 22:31:29 +01:00
Hans-Christoph Steiner
903a7396b1 switch to preferring apksigner, requiring for fdroid publish 2021-03-22 22:30:49 +01:00
Hans-Christoph Steiner
8a9852209b update: do not die when androguard files to extract icon
https://jenkins.debian.net/job/reproducible_fdroid_test/422
https://jenkins.debian.net/job/reproducible_fdroid_test/423

```
Traceback (most recent call last):
  File "../fdroid", line 22, in <module>
    fdroidserver.__main__.main()
  File "/var/lib/jenkins/userContent/reproducible/reproducible_fdroid_build_apps/fdroidserver/__main__.py", line 227, in main
    raise e
  File "/var/lib/jenkins/userContent/reproducible/reproducible_fdroid_build_apps/fdroidserver/__main__.py", line 208, in main
    mod.main()
  File "/var/lib/jenkins/userContent/reproducible/reproducible_fdroid_build_apps/fdroidserver/update.py", line 2316, in main
    apks, cachechanged = process_apks(apkcache, repodirs[0], knownapks, options.use_date_from_apk)
  File "/var/lib/jenkins/userContent/reproducible/reproducible_fdroid_build_apps/fdroidserver/update.py", line 1746, in process_apks
    use_date_from_apk, ada, True)
  File "/var/lib/jenkins/userContent/reproducible/reproducible_fdroid_build_apps/fdroidserver/update.py", line 1619, in process_apk
    apk = scan_apk(apkfile)
  File "/var/lib/jenkins/userContent/reproducible/reproducible_fdroid_build_apps/fdroidserver/update.py", line 1385, in scan_apk
    scan_apk_androguard(apk, apk_file)
  File "/var/lib/jenkins/userContent/reproducible/reproducible_fdroid_build_apps/fdroidserver/update.py", line 1527, in scan_apk_androguard
    resource_id = arsc.get_id(apk['packageName'], icon_id)
  File "/usr/lib/python3/dist-packages/androguard/core/bytecodes/axml/__init__.py", line 1668, in get_id
    self._analyse()
  File "/usr/lib/python3/dist-packages/androguard/core/bytecodes/axml/__init__.py", line 1321, in _analyse
    ate = self.packages[package_name][nb + 3 + nb_i]
IndexError: list index out of range

```
2021-03-22 18:16:34 +01:00
Hans-Christoph Steiner
50f0534d87 publish: always use apksigner to sign APKs, closes #880 2021-03-22 18:16:34 +01:00
Hans-Christoph Steiner
08cde5c2e6 code formatting: black --skip-string-normalization --line-length 100 2021-03-22 18:16:34 +01:00
Hans-Christoph Steiner
7f458f8f8c Merge branch 'vercode_bracket' into 'master'
Support versionCode in brackets

Closes fdroiddata#2338

See merge request fdroid/fdroidserver!888
2021-03-22 16:55:42 +00:00
Jochen Sprickerhof
ea9f917ddc Support versionCode and versionName in brackets
Example: versionCode(29)
https://github.com/florisboard/florisboard/blob/v0.3.9/app/build.gradle.kts#L24
2021-03-19 13:58:02 +01:00
Hans-Christoph Steiner
6ba647baec Merge branch 'fix-update-py-triple-t' into 'master'
update: take build subdir into account when looking for triple-t data

Closes fdroiddata#2295

See merge request fdroid/fdroidserver!883
2021-03-17 13:40:53 +00:00
Christian Beier
553daf8552 update: take build subdir into account when looking for triple-t data
Implemented as a fallback solution when parsing settings.gradle
and globbing the build dir with "'*', 'src', '*', 'play'" did not
yield results.

Before, the logic would not find triple-t metadata in projects where
settings.gradle is in a subdirectory or 'src' is found at a directory
depth != 2.

Closes fdroid/fdroiddata#2295
2021-03-17 13:19:44 +00:00
Hans-Christoph Steiner
dbf80ad771
metadata: remove git repo handling from metadata parsing
This is a vestige of implementing builds from a .fdroid.yml file directly
in the app's source repo.  It was never fully complete and seems to not be
used in any apps in fdroiddata.  This makes `fdroid build --all` runs much
faster since it does not need to do any git handling for apps that do not
have any new builds to run.

4e8e29794
948689281
a4e431080
e37be9b06
e775d330c
2021-03-17 13:44:24 +01:00
Hans-Christoph Steiner
598c87c78f set development version
https://www.python.org/dev/peps/pep-0440/#developmental-releases
2021-03-17 11:53:04 +01:00
Sylvia van Os
d5a3182ce9 Merge branch 'bug-fixes' into 'master'
status JSON and --scan-binary should not exit with error when apkanalyzer fails

Closes #825

See merge request fdroid/fdroidserver!886
2021-03-15 10:33:31 +00:00
Hans-Christoph Steiner
78842e9cc2 scanner: should not exit with error when apkanalyzer fails
apkanalyzer produces useful output when it can run, but it does not
support all recent JDK versions, and also some DEX versions, so this
cannot count on it to always produce useful output or even to run
without exiting with an error.

211dd65ff0 was based on false
assumptions that apkanalyzer can always produce output.

fdroiddata!8585
fdroiddata!8584
2021-03-15 10:54:29 +01:00
Hans-Christoph Steiner
fc368dc291 makebuildserver: print message before rsyncing caches
This process can take a very long time if the caches are large, so at least
print something about what it is doing.
2021-03-15 10:29:08 +01:00
Hans-Christoph Steiner
5695993521 build: include useful successful build IDs in status JSON, closes #825 2021-03-11 18:52:31 +01:00
Hans-Christoph Steiner
a3d828ea48
update CHANGELOG 2021-03-11 08:43:57 +01:00
Hans-Christoph Steiner
cc3b88ab30 gradlew-fdroid: use gradle zipballs from local cachedir, if present 2021-03-11 08:40:34 +01:00
Hans-Christoph Steiner
4b05854ffc buildserver: only install the latest gradle version
gradle checksums are now handled by gradlew-fdroid

refs #370 #517 #737
2021-03-11 08:40:34 +01:00
Hans-Christoph Steiner
e6f5e68e02 Merge branch 'ndk21e' into 'master'
Add NDK 21e

Closes #875

See merge request fdroid/fdroidserver!882
2021-03-11 07:38:17 +00:00
Licaon_Kter
d683a40f96 Add NDK 21e 2021-03-10 16:36:14 +02:00
Hans-Christoph Steiner
757d423c07 Merge branch 'obfusk-master-patch-10564' into 'master'
use vagrantfile instead of 'builder/Vagrantfile' in get_clean_builder()

See merge request fdroid/fdroidserver!881
2021-03-10 09:34:34 +00:00
Felix C. Stegerman
259ca51001 use vagrantfile instead of 'builder/Vagrantfile' in get_clean_builder() 2021-03-10 09:12:52 +00:00
Hans-Christoph Steiner
77c0c8bc5a Merge branch 'bug-fix-grab-bag' into 'master'
bug fix grab bag; and, complete 'build' JSON status

Closes #344

See merge request fdroid/fdroidserver!875
2021-03-09 20:33:20 +00:00
Hans-Christoph Steiner
65836d9e9b run-tests: fix local_copy_dir test, it broke when /tmp/fdroid existed 2021-03-09 17:55:10 +01:00
Hans-Christoph Steiner
8bb2c7d4b1 metadata: stop setting up source repo when running lint/rewritemeta
broken in 54e8867a7e
2021-03-09 17:55:07 +01:00