Commit Graph
6887 Commits
Author SHA1 Message Date
Jochen Sprickerhof 8a089691ea Merge branch 'genodeftest-master-patch-82391' into 'master'
Doc: Clarify wording example for config.yml

See merge request fdroid/fdroidserver!1024
2021-10-13 13:44:27 +00:00
Christian Stadelmann a0a86aa5ec Clarify wording example for config.yml
Note: The old wording was applicable to the python version of this config file only.
2021-10-02 08:13:48 +00:00
Hans-Christoph Steiner bd079c9311 Merge branch 'NoahAndrews-master-patch-97157' into 'master'
Handle error when parsing WebView icon

Closes #903

See merge request fdroid/fdroidserver!1018
2021-10-01 15:01:21 +00:00
Noah Andrews 75989ff59a Handle error when parsing WebView icon
Fixes #903
2021-10-01 16:44:28 +02:00
Hans-Christoph Steiner da10acfe2c update: add test with APK for icon_id related exceptions 2021-10-01 16:44:14 +02:00
Hans-Christoph Steiner 80d238180b Merge branch 'obfusk-master-patch-85387' into 'master'
scanner: add com.google.mlkit to NON_FREE_GRADLE_LINES

See merge request fdroid/fdroidserver!1021
2021-10-01 13:11:16 +00:00
Felix C. Stegerman dbfbc4163c scanner: add com.google.mlkit to NON_FREE_GRADLE_LINES 2021-10-01 13:10:45 +00:00
Felix C. Stegerman 5b86242dde Merge branch 'triple-t-flavours' into 'master'
copy_triple_t_store_metadata(): handle subdir + flavor

Closes fdroiddata#2487

See merge request fdroid/fdroidserver!1022
2021-09-29 21:53:26 +00:00
Felix C. Stegerman c2ed538ea4 copy_triple_t_store_metadata(): handle subdir + flavor 2021-09-29 21:36:11 +00:00
Hans-Christoph Steiner 311e6a14f1 Merge branch 'black' into 'master'
Add CI job "black" for code format checks

See merge request fdroid/fdroidserver!998
2021-09-29 18:00:06 +00:00
FestplattenSchnitzel ef20e1b329 Add CI job "black" for code format checks
The CI job will fail, if a file needs to be reformatted.
Only files already well formatted will be checked at the moment.
2021-09-25 15:45:37 +00:00
Hans-Christoph Steiner c71c2465d3 tests: silence the linters 2021-09-20 10:51:54 +02:00
Hans-Christoph Steiner cc666907a3 Merge 'fix-ndk-long-form-version' into 'master'
* fix-ndk-long-form-version:
  test whether NDK version parsing is working properly
  Fix invalid key error due to NDK versions in "revision" form  (e.g. 21.4.7075529)

fdroid/fdroidserver!1020
2021-09-20 10:20:07 +02:00
Hans-Christoph Steiner d6fd165444 test whether NDK version parsing is working properly 2021-09-20 10:18:16 +02:00
Gaurav Ujjwal 07856dc0e0 Fix invalid key error due to NDK versions in "revision" form (e.g. 21.4.7075529)
First element in the 'NDKS' array does not have 'revision'  key, which results in 'KeyError' when accessed through subscript operator.
2021-09-19 09:44:37 +00:00
Hans-Christoph Steiner 714ab5622e Merge branch 'new-primary-mirror' into 'master'
mirror-to-mirror.sh: also sync to plug-mirror.rcac.purdue.edu

See merge request fdroid/fdroidserver!1017
2021-09-16 08:15:34 +00:00
Hans-Christoph Steiner adbd7ba757 mirror-to-mirror.sh: also sync to plug-mirror.rcac.purdue.edu
This is the deployed script for pushing to the primary mirrors.  It starts
with the 'repo' section and runs all the rsyncs in parallel to each primary
mirror.  Once the 'repo' syncs are done, it does the same process for the
'archive' syncs. This adds a new primary push mirror at PLUG. #163

!800 !792
[skip ci]
2021-09-16 10:11:27 +02:00
Hans-Christoph Steiner 5b9fd12150 Merge branch 'fix_ci' into 'master'
Fix get_dir_size call

See merge request fdroid/fdroidserver!1015
2021-09-13 11:35:55 +00:00
Hans-Christoph Steiner 8ea154c125 fix IndexTest.test_gitlab_get_mirror_service_urls
This makes it actually call the method rather than mocking it.
2021-09-13 13:18:21 +02:00
Jochen Sprickerhof 0783f97bed Fix get_dir_size call
Regression of 7987c746.
2021-09-13 11:16:16 +00:00
Hans-Christoph Steiner 04ac629bd2 Merge branch 'obfusk-master-patch-89864' into 'master'
find_sdk_tools_cmd(): s/found/not found/ in error message

See merge request fdroid/fdroidserver!1016
2021-09-13 10:49:33 +00:00
Felix C. Stegerman 6bd8470d55 find_sdk_tools_cmd(): s/found/not found/ in error message 2021-09-12 22:40:50 +00:00
Jochen Sprickerhof 4ef8d1340f Merge branch 'submodules-on-host' into 'master'
build: run vcs.initsubmodules() on host as well

See merge request fdroid/fdroidserver!994
2021-09-11 15:46:56 +00:00
Felix C. Stegerman 53ff7de445 build: run vcs.initsubmodules() on host as well
otherwise, e.g. triple-t metadata in a submodule will not be available
on the host and thus not be used at all
2021-09-11 15:31:27 +00:00
Jochen Sprickerhof 07ddb8a6db Merge branch 'gitlab-pages-fix' into 'master'
index: do not include GitLab Pages mirror if it can't be deployed

See merge request fdroid/fdroidserver!1005
2021-09-11 15:31:12 +00:00
Hans-Christoph Steiner 7987c746de index: do not include GitLab Pages mirror if it can't be deployed
GitLab Pages sites are limited to 1GB on gitlab.com, so the CI/CD job will
fail if the repo is bigger than that.  It should not be included as a
mirror in that case.

https://docs.gitlab.com/ee/user/gitlab_com/#gitlab-pages
2021-09-11 15:30:55 +00:00
Jochen Sprickerhof eb2fdc5a58 Merge branch 'fix_stretch_ruamel' into 'master'
Support ruamel from Debian stretch

See merge request fdroid/fdroidserver!996
2021-09-11 09:32:05 +00:00
Jochen Sprickerhof 28098c32e3 Support ruamel from Debian stretch 2021-09-11 09:16:15 +00:00
Jochen Sprickerhof 52eeb21763 Merge branch 'verbose_build' into 'master'
Provide verbose output with --verbose

Closes #882

See merge request fdroid/fdroidserver!1013
2021-09-10 17:01:00 +00:00
Jochen Sprickerhof 2b41dffcb2 Provide verbose output with --verbose
23b0b6bc added logging in case of an FDroidException on the build
server. This broke the log of apps that fail to build.

Prior to 23b0b6bc a failing build in the VM triggered a BuildException
on the server side but the build output was written to the log in the
finally part of build_server(). After 23b0b6bc the finally part writs
the build as well but the BuildException is caught in main() and the
build log is overwritten with the empty exception content. This patch
always adds the build log to the exception so it is written to the log.

Closes: #882
2021-09-10 14:10:46 +02:00
Hans-Christoph Steiner 63eaa5469c Merge branch 'missing_logs' into 'master'
Deploy build error log in case of an exception

See merge request fdroid/fdroidserver!1007
2021-08-27 20:09:12 +00:00
Jochen Sprickerhof 72df2639a2 Log traceback with exception 2021-08-27 13:29:07 +02:00
Jochen Sprickerhof 23b0b6bcaf Deploy build error log in case of an exception
This happened with us.spotco.fennec_dos_2912000 where no build log was
saved in the repo but the wiki has an error text. The error text was:

"Command '['rsync', '--recursive', '--perms', '--links', '--quiet', '--rsh=ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o LogLevel=FATAL -o IdentitiesOnly=yes -o PasswordAuthentication=no -p 2222 -i /home/fbuild/.vagrant.d/boxes/buildserver/0/virtualbox/vagrant_private_key', 'build/srclib/MozFennec', 'vagrant@127.0.0.1:/home/vagrant/build/srclib']' returned non-zero exit status 255."

Which is generated by the rsync subprocess call in build_server(). I
assume that it threw an Exception (not an FdroidException, because the
string "Build completed at" is not in the wiki site) that was caught in
main().
2021-08-27 08:05:28 +02:00
Jochen Sprickerhof 7c88bb09a5 Merge branch 'fix-backports' into 'master'
[buildserver] run update again after upgrade

See merge request fdroid/fdroidserver!1006
2021-08-25 12:59:17 +00:00
Felix C. Stegerman 779a592ea0 [buildserver] run update again after upgrade 2021-08-25 14:51:20 +02:00
Jochen Sprickerhof e80269fb48 Merge branch 'dpkg_confdef' into 'master'
[makebuildserver] run dpkg with --force-confdef

See merge request fdroid/fdroidserver!1004
2021-08-24 07:16:16 +00:00
Jochen Sprickerhof e1a67c9d97 [makebuildserver] run dpkg with --force-confdef
There has been a whitespace change in the accessibility.properties
configuration file as part of the openjdk-8-jre-headless
8u302-b08-1~deb9u1 version. As we modified the file, this broke
makebuildserver, asking for confirmation.
2021-08-23 22:48:14 +02:00
Hans-Christoph Steiner 4088c3a9ec Merge branch 'readme' into 'master'
Update README.md

See merge request fdroid/fdroidserver!997
2021-08-23 11:47:45 +00:00
FestplattenSchnitzel 83e16422a5 Update README.md
Add F-Droid icon, redesign, misc fixes
2021-08-23 11:44:48 +00:00
Hans-Christoph Steiner e77e110a64 Merge branch 'using_defaults' into 'master'
Remove waring about no config file

See merge request fdroid/fdroidserver!999
2021-08-23 11:42:19 +00:00
Jochen Sprickerhof b62124853a Remove waring about no config file
fdroid works fine without a config so there is no reason to warn about
it.
2021-08-23 11:41:44 +00:00
Hans-Christoph Steiner 4cf48cc9c4 Merge branch 'ndk-release-checksums.py' into 'master'
update NDK

See merge request fdroid/fdroidserver!1003
2021-08-23 11:02:17 +00:00
fdroid-bot 54bc6f05de Android NDK None (None) 2021-08-23 10:48:53 +00:00
Hans-Christoph Steiner 9b0de17807 Merge branch 'gradle-release-checksums.py' into 'master'
update to gradle v7.2

See merge request fdroid/fdroidserver!1002
2021-08-23 10:48:14 +00:00
fdroid-bot 51d161d69a gradle v7.2 2021-08-21 19:29:30 +00:00
Jochen Sprickerhof ab785c5ccd Merge branch 'checkupdates_warn_tag' into 'master'
[checkupdates] Warn if no version in latest tag

See merge request fdroid/fdroidserver!1001
2021-08-21 19:28:54 +00:00
Jochen Sprickerhof fde48a1e77 [checkupdates] Warn if no version in latest tag 2021-08-21 08:23:27 +02:00
Hans-Christoph Steiner 5e35c20d5d Merge branch 'fix-issuebot-48' into 'master'
import: fix error when using python3-git from stretch

Closes #48 and issuebot#48

See merge request fdroid/fdroidserver!993
2021-08-10 07:58:12 +00:00
Hans-Christoph Steiner 3283ce2510 import: fix error when using python3-git from stretch
closes https://gitlab.com/fdroid/issuebot/-/issues/48#note_646592031
closes issuebot#48
2021-08-09 16:27:56 +02:00
Hans-Christoph Steiner c4d3e075cb Merge branch 'fix_update' into 'master'
Don't fail fdroid update on empty repository

See merge request fdroid/fdroidserver!990
2021-08-05 16:18:22 +00:00