1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-08-15 19:00:11 +02:00
Commit Graph

6519 Commits

Author SHA1 Message Date
Hans-Christoph Steiner
544a45c16a index: raise error rather than crash on bad repo file
If a non-APK is added with the appid/packageName that matches some APKs, it
should through an error.

Traceback (most recent call last):
  File "/home/hans/code/fdroid/server/fdroid", line 22, in <module>
    fdroidserver.__main__.main()
  File "/home/hans/code/fdroid/server/fdroidserver/__main__.py", line 211, in main
    mod.main()
  File "/home/hans/code/fdroid/server/fdroidserver/update.py", line 2343, in main
    index.make(apps, sortedids, apks, repodirs[0], False)
  File "/home/hans/code/fdroid/server/fdroidserver/index.py", line 142, in make
    fdroid_signing_key_fingerprints)
  File "/home/hans/code/fdroid/server/fdroidserver/index.py", line 166, in make_v1
    v1_sort_packages(packages, fdroid_signing_key_fingerprints)
  File "/home/hans/code/fdroid/server/fdroidserver/index.py", line 292, in v1_sort_packages
    packages.sort(key=v1_sort_keys)
  File "/home/hans/code/fdroid/server/fdroidserver/index.py", line 288, in v1_sort_keys
    .format(apkfilename=package['apkName']))
fdroidserver.exception.FDroidException: at.roteskreuz.stopcorona_8.jobf does not have a valid signature!
2021-03-09 15:40:30 +01:00
Hans-Christoph Steiner
b5c941938a update: reuse local_copy_dir to provide auto-copying with --nosign
When using `fdroid update --nosign` in combo with `fdroid signindex`, the
unsigned index files have to be copied to a thumb drive or something in
order to be brought to the offline signing server.  This reuses the config
option local_copy_dir as the destination for those unsigned index files.
2021-03-09 15:40:30 +01:00
Hans-Christoph Steiner
a2f0356d84 build: include all wiki data in the JSON status output 2021-03-09 15:40:30 +01:00
Hans-Christoph Steiner
c1b83c24d1 Merge branch 'obfusk-master-patch-47191' into 'master'
fix "vritualbox" typo in BASEBOX_CHECKSUMS

See merge request fdroid/fdroidserver!879
2021-03-09 13:03:35 +00:00
Felix C. Stegerman
7fa7270589 fix "vritualbox" typo in BASEBOX_CHECKSUMS 2021-03-09 12:42:43 +00:00
Hans-Christoph Steiner
e2467a2e02 Merge branch 'build-72h' into 'master'
build: set overall timeout to 72 hours

See merge request fdroid/fdroidserver!878
2021-03-08 13:37:13 +00:00
relan
56b84251f6 build: set overall timeout to 72 hours
Some builds are pending for weeks now because of the global time limit.
Give them a chance to be built.
2021-03-08 11:41:30 +03:00
Sylvia van Os
fc3906aad3 Merge branch 'gradle-release-checksums.py' into 'master'
update to gradle v6.8.3

See merge request fdroid/fdroidserver!874
2021-03-01 21:54:56 +00:00
fdroid-bot
898b5dbb4a gradle v6.8.3 2021-03-01 21:34:31 +00:00
Hans-Christoph Steiner
834307a9f6 Merge branch 'monitor_version' into 'master'
Add needsUpdate and noUpdateCheck to update.json

See merge request fdroid/fdroidserver!870
2021-02-12 11:24:14 +00:00
Jochen Sprickerhof
933eea149a Add needsUpdate and noUpdateCheck to update.json
As done in update_wiki.
2021-02-12 11:04:24 +00:00
Hans-Christoph Steiner
cb5ebfc8f0 Merge branch 'publish_unsigned' into 'master'
Publish unsigned builds

See merge request fdroid/fdroidserver!864
2021-02-12 10:40:18 +00:00
Jochen Sprickerhof
7f2cbd1876 Fix serverwebroot test 2021-02-12 10:20:30 +00:00
Jochen Sprickerhof
33bff6b298 Publish unsigned builds
This should make debugging reproducible builds easier.
2021-02-12 10:20:30 +00:00
Hans-Christoph Steiner
0d836751e5
code format cleanup 2021-02-12 10:58:07 +01:00
Hans-Christoph Steiner
007c62065d
pylint flags "_" as bad variable name, its the gettext function
Throughout the fdroidserver code base, "_()" is used for localizing
strings.  So it should not be used as an ignored variable name.  Those
should be called "_ignored".
2021-02-12 10:56:31 +01:00
Ciaran Gultnieks
fb877c8b81 Merge branch 'licaon-kter-master-patch-25160' into 'master'
Add python3-qrcode to buildserver

See merge request fdroid/fdroidserver!871
2021-02-12 09:48:11 +00:00
Licaon_Kter
5396b79da7 Fix after https://gitlab.com/fdroid/fdroidserver/-/merge_requests/853 2021-02-12 09:14:27 +00:00
Ciaran Gultnieks
a36572dd98 Merge branch 'fix-contact-website.txt' into 'master'
update: handle large, corrupt, or inaccessible fastlane/triple-t files

See merge request fdroid/fdroidserver!869
2021-02-11 21:38:37 +00:00
Hans-Christoph Steiner
525dcb8f98 update: handle large, corrupt, or inaccessible fastlane/triple-t files
```
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 2340, in main
    repoapps = prepare_apps(apps, apks, repodirs[0])
  File "/var/lib/jenkins/userContent/reproducible/reproducible_fdroid_build_apps/fdroidserver/update.py", line 2176, in prepare_apps
    copy_triple_t_store_metadata(apps_with_packages)
  File "/var/lib/jenkins/userContent/reproducible/reproducible_fdroid_build_apps/fdroidserver/update.py", line 1076, in copy_triple_t_store_metadata
    _set_author_entry(app, 'authorWebSite', os.path.join(root, f))
  File "/var/lib/jenkins/userContent/reproducible/reproducible_fdroid_build_apps/fdroidserver/update.py", line 784, in _set_author_entry
    with open(f, errors='replace') as fp:
FileNotFoundError: [Errno 2] No such file or directory: 'build/player.efis.cfd/pfd/src/main/play/contact-website.txt'
```
2021-02-11 17:42:13 +01:00
Hans-Christoph Steiner
14e9bffedb Merge branch 'fossdd-spdx-revert-removing-licenses' into 'master'
Revert removing Licenses

See merge request fdroid/fdroidserver!868
2021-02-10 20:09:01 +00:00
fossdd
bcdefccb31 Revert removing Licenses 2021-02-10 19:10:14 +00:00
Hans-Christoph Steiner
d75ba81be0
gitlab-ci: arch job needs to build python-cryptography 2021-02-09 09:26:07 +01:00
Hans-Christoph Steiner
267d7a4eac Merge branch 'fossdd-update-spdx' into 'master'
Update SPDX License List

See merge request fdroid/fdroidserver!867
2021-02-08 21:42:30 +00:00
fossdd
8371a2e07a Update SPDX License List 2021-02-08 15:14:28 +00:00
Hans-Christoph Steiner
0a4c5afd52 Merge branch 'generate-index' into 'master'
Generate index.html and qrcode.png

Closes #688

See merge request fdroid/fdroidserver!853
2021-02-08 14:30:40 +00:00
Benedikt Brückmann
9c609aa361 Fix copy-paste error 2021-02-08 12:25:02 +01:00
Benedikt Brückmann
23931e6818 Install [test] dependencies when running complete-ci-tests 2021-02-08 12:25:02 +01:00
Benedikt Brückmann
b1bde9e407 * Skip tidy check if html5print is not available
* install test dependencies on arch
2021-02-08 12:25:02 +01:00
Benedikt Brückmann
d5a90ed60e add html5print as test dependency 2021-02-08 12:25:02 +01:00
Benedikt Brückmann
022d73b3b6 Add HTML/CSS tidy test
and tidy up the content
2021-02-08 12:25:02 +01:00
Benedikt Brückmann
0936051c7b Fix pep8 2021-02-08 12:25:02 +01:00
Benedikt Brückmann
96854be84a Only overwrite index.html/css files which were created by fdroid update
Further changes:
* use real value for icon instead of hard coded value
* Move qrcode.make() to top
* fix identation of css file generation
2021-02-08 12:25:02 +01:00
Benedikt Brückmann
8d51566a70 * Change image name
* add fingerprint
2021-02-08 12:25:02 +01:00
Benedikt Brückmann
4d464051ff Fix pycodestlye errors 2021-02-08 12:25:02 +01:00
Benedikt Brückmann
997f5d267b Properly add css 2021-02-08 12:25:02 +01:00
Benedikt Brückmann
44ee531426 Add QR code and css 2021-02-08 12:25:02 +01:00
Benedikt Brückmann
788333991d move code to own method 2021-02-08 12:25:02 +01:00
Benedikt Brückmann
12682f063d First draft of index.html generation 2021-02-08 12:25:02 +01:00
Hans-Christoph Steiner
7c5672a47a Merge branch 'gradle-release-checksums.py' into 'master'
update to gradle v6.8.2

See merge request fdroid/fdroidserver!866
2021-02-08 11:00:34 +00:00
fdroid-bot
59a4ec79b3 gradle v6.8.2 2021-02-08 10:42:22 +00:00
Hans-Christoph Steiner
c887c14be1 gitlab-ci: use python3-cryptography to avoid building rust sources 2021-02-08 11:40:41 +01:00
Hans-Christoph Steiner
3d536d4515
gitlab-ci: use python3-cryptography to avoid building rust sources 2021-02-08 10:59:48 +01:00
Hans-Christoph Steiner
fc7f9204b6 checkupdates: set User-Agent to make gitlab.com happy
closes #863
2021-02-02 21:37:53 +01:00
Hans-Christoph Steiner
682761e75d
setup changelog and version for development 2021-02-02 13:54:22 +01:00
Hans-Christoph Steiner
f3097e142d fix broken GitLab CI badge on README 2021-02-02 11:37:00 +01:00
Hans-Christoph Steiner
57017fa373 Merge branch 'transparency_once' into 'master'
Run push_binary_transparency only once

See merge request fdroid/fdroidserver!865
2021-02-02 09:53:52 +00:00
Jochen Sprickerhof
2103569958 Run push_binary_transparency only once 2021-02-02 09:07:28 +01:00
Hans-Christoph Steiner
fa186c40c4 version 2.0 2021-02-01 22:50:36 +01:00
Hans-Christoph Steiner
65ef6f33e3 make -C locale/ update 2021-02-01 22:50:03 +01:00