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

6415 Commits

Author SHA1 Message Date
Jochen Sprickerhof
d44f35bd25 Add missing test apk 2020-11-25 14:11:46 +01:00
Hans-Christoph Steiner
0f48a052cc Merge branch 'fix-crash-with-config-yml' into 'master'
fix stacktrace crash when env vars are badly set in config.yml

See merge request fdroid/fdroidserver!827
2020-11-12 16:49:35 +00:00
Hans-Christoph Steiner
d530733290 fix stacktrace crash when env vars are badly set in config.yml
This was trying to delete from a dict that was being iterated through.
Python doesn't like that!
2020-11-12 17:00:03 +01:00
Hans-Christoph Steiner
80891be139 Merge branch 'more-api-fixes' into 'master'
do not assume `app` is an App instance, support API usage

See merge request fdroid/fdroidserver!826
2020-11-10 16:44:49 +00:00
Hans-Christoph Steiner
9442a9e614 do not assume app is an App instance, support API usage
When using fdroidserver methods as an API, the full setup might not
have taken place.  `app` instances can always just be a dict, the App
class is mostly just a typing shortcut.  This is incremental, it only
affects a couple of functions in fdroidserver/update.py.
2020-11-10 17:02:15 +01:00
Hans-Christoph Steiner
a1df5ef86a gitlab-ci: try rules:changes: to limit "fdroiddata fdroid build" runs
https://docs.gitlab.com/ee/ci/yaml/#using-onlychanges-with-pipelines-for-merge-requests
2020-11-10 17:00:58 +01:00
Hans-Christoph Steiner
767573f2ec
init: fix init with Debian Android SDK packages
If the auto-detected SDK path passes test_sdk_exists(), then just use
it without prompting.

fixes !821
2020-11-10 10:20:43 +01:00
Hans-Christoph Steiner
85fa53008c Merge branch '92lleo-master-patch-52783' into 'master'
Add platform 30

See merge request fdroid/fdroidserver!825
2020-11-09 19:08:40 +00:00
Hans-Christoph Steiner
10d5aa6bc4
gitlab-ci: test 'fdroid build' CI job setup 2020-11-09 14:55:09 +01:00
Hans-Christoph Steiner
e927ed02a8
provision-apt-get-install: fix gpg from stretch-backports-sloppy
!822

The gpg dependencies are complicated.  The previous setup was always
failing with:
The following information may help to resolve the situation:
The following packages have unmet dependencies:
 gpg : Depends: gpgconf (= 2.2.20-1~bpo9+1)
       Depends: libassuan0 (>= 2.5.0) but 2.4.3-2 is to be installed
       Depends: libgpg-error0 (>= 1.35) but 1.26-2 is to be installed

Thanks to @izzysoft to spotting this.
2020-11-09 14:37:55 +01:00
Leonhard Künzler
ce46978099 Add platform 30 2020-11-09 11:23:40 +01:00
Michael Pöhn
196dc75481 Merge branch 'yaml-config' into 'master'
move config.py to config.yml

See merge request fdroid/fdroidserver!571
2020-11-05 23:00:32 +00:00
Michael Pöhn
51a099cb3d Merge branch 'gpgaptfix' into 'master'
Use newer gpg from sloppy

See merge request fdroid/fdroidserver!822
2020-11-04 15:22:39 +00:00
Michael Pöhn
9f11495934 Merge branch 'purge-aapt' into 'master'
purge aapt requirements and elevate apksigner

Closes #627

See merge request fdroid/fdroidserver!821
2020-11-04 15:18:40 +00:00
Hans-Christoph Steiner
975fb5b224 Merge branch 'fix-fedora-test' into 'master'
gitlab-ci: fix fedora test failing on Python setup

See merge request fdroid/fdroidserver!823
2020-11-02 15:06:49 +00:00
Hans-Christoph Steiner
b2b6e62b8d gitlab-ci: fix fedora test failing on Python setup
Avoid having to compile matplotlib and its C dependencies.
2020-11-02 15:38:46 +01:00
licaon-kter
2fc0178972 Use newer gpg from sloppy 2020-11-01 14:02:48 +02:00
Hans-Christoph Steiner
ece901fb7c Merge branch 'destroy' into 'master'
build: destroy vm after each build

See merge request fdroid/fdroidserver!814
2020-10-31 10:37:42 +00:00
mimi89999
5485869e3f
build: destroy vm after each build 2020-10-31 10:55:14 +01:00
Hans-Christoph Steiner
f430c58d01 make examples/template.yml pass yamllint 2020-10-23 14:20:49 +02:00
Hans-Christoph Steiner
a9fdb5b401 init: switch to config.yml as the default format 2020-10-23 14:20:49 +02:00
Hans-Christoph Steiner
4bbbf35511 support both config.py and config.yml in common.write_to_config() 2020-10-23 14:18:55 +02:00
Hans-Christoph Steiner
2d115135f7 support env vars in config.yml: awsaccesskeyid: {env: AWS_KEY} 2020-10-23 14:18:55 +02:00
Hans-Christoph Steiner
d3d48dba5e add config.yml as default config file format
None of the config options in config.py require Python code.  YAML is a
common config data format, and it is also used for build metadata.  It is
also much safer to use since it can be pure data, without anything
executable in it.  This also reduces the attack surface of the fdroid
process by eliminating a guaranteed place to write to get code executed.
With config.py, any exploit that can get local write access can turn that
into execute access by writing to the config.py, then cleaning up after
itself once it has what it needs.  Switching to YAML removes that vector
entirely.

Also, this removes the config_file argument.  It is not used in either
fdroidserver or repomaker.  Also, it probably wouldn't work since so
much of the code assumes that the current working dir is the root of the
repo.
2020-10-23 14:18:55 +02:00
Hans-Christoph Steiner
fd41b70e27 purge common.use_androguard, it is now used by default
Up until now, the buildserver has not included androguard.  Since a
good version of androguard (v3.3.3+) is included in stretch-backports
and the buildserver is already setup to use stretch-backports, this
sets up the buildserver with androguard.

closes #627
2020-10-22 11:58:55 +02:00
Hans-Christoph Steiner
aa80662642 init: enable apksigner by default so v2/v3 APK signatures validate
Ultimately we want to get to using apksigner by default everywhere,
this gets us closer to that by setting up all new repos to use
apksigner by default in the config.py
2020-10-22 09:53:51 +02:00
Hans-Christoph Steiner
989159ef09 require build-tools that fully supports apksigner 2020-10-22 09:53:51 +02:00
Hans-Christoph Steiner
501a33f117 remove unused helper function 2020-10-22 09:53:51 +02:00
Hans-Christoph Steiner
08931f4524 purge update.scan_apk_aapt()
androguard v3.3.3+ properly extracts the app name, so this adds the
names to the tests.
2020-10-22 09:53:51 +02:00
Hans-Christoph Steiner
8fd7dcd425 always use androguard version of common.get_apk_id() first
This removes the need for common.use_androguard()
2020-10-22 09:51:12 +02:00
Hans-Christoph Steiner
27b90a13bf remove aapt version of common.is_apk_and_debuggable() 2020-10-22 09:51:12 +02:00
Hans-Christoph Steiner
b5cd850abe apksigner search should use MINIMUM_APKSIGNER_BUILD_TOOLS_VERSION 2020-10-22 09:51:12 +02:00
Hans-Christoph Steiner
48e11ea3f1 run-tests: exit with error if no test APKs are found
There must be at least one APK available for this test suite to work, for
example, this test:

grep -F '<application id=' repo/index.xml

This can't be easily implemented using an env vir beccause the while
loop is running in a pipe, so a different process.
copy_apks_into_repo is used with throwaway tmp dirs, so the stamp file
should work well.
2020-10-22 09:51:12 +02:00
Hans-Christoph Steiner
3e35b2dd27
make -C locale update 2020-10-21 18:05:32 +02:00
Michael Pöhn
c63c4b3deb Merge remote-tracking branch 'eighthave/rename-server-to-deploy' 2020-10-21 15:02:17 +02:00
Hans-Christoph Steiner
3eba5de218 Merge branch 'weblate' into 'master'
Weblate

See merge request fdroid/fdroidserver!820
2020-10-21 10:21:24 +00:00
Hans-Christoph Steiner
17f6a778ba deploy: move server.py to deploy.py and remove aliases
closes #832
2020-10-21 11:38:49 +02:00
Hans-Christoph Steiner
8daf273843 server: purge fdroid server init command, it is totally unneeded
The existing rsync command used to deploy via SSH will create all the dirs
that `fdroid server init` does.
2020-10-21 10:29:21 +02:00
Hakim Oubouali
73a6a9c046 Added translation using Weblate: Central Atlas Tamazight (tzm) by Hakim Oubouali <hakim.oubouali.skr@gmail.com>
Co-authored-by: Hakim Oubouali <hakim.oubouali.skr@gmail.com>
2020-10-20 23:18:11 +02:00
IvanDan
f7f65e26c3 Translated using Weblate: Italian (it) by IvanDan <ivandanza@gmail.com>
Currently translated at 34.9% (199 of 569 strings)

Co-authored-by: IvanDan <ivandanza@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/it/
Translation: F-Droid/F-Droid Server
2020-10-20 23:18:11 +02:00
marzzzello
45959775b3 Translated using Weblate: German (de) by marzzzello <anmeldezeugs@top-email.net>
Currently translated at 86.2% (491 of 569 strings)

Co-authored-by: marzzzello <anmeldezeugs@top-email.net>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/de/
Translation: F-Droid/F-Droid Server
2020-10-20 23:18:11 +02:00
WaldiS
4e0b0f63e9 Translated using Weblate: Polish (pl) by WaldiS <sto@tutanota.de>
Currently translated at 84.5% (481 of 569 strings)

Co-authored-by: WaldiS <sto@tutanota.de>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/pl/
Translation: F-Droid/F-Droid Server
2020-10-20 23:18:11 +02:00
random r
60ca80ff4e Translated using Weblate: Italian (it) by random r <epsilin@yopmail.com>
Currently translated at 34.6% (197 of 569 strings)

Co-authored-by: random r <epsilin@yopmail.com>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/it/
Translation: F-Droid/F-Droid Server
2020-10-20 23:18:11 +02:00
ssantos
4a8db4e283 Translated using Weblate: Portuguese (pt) by ssantos <ssantos@web.de>
Currently translated at 100.0% (569 of 569 strings)

Translated using Weblate: Portuguese (Portugal) (pt_PT) by ssantos <ssantos@web.de>

Currently translated at 100.0% (569 of 569 strings)

Co-authored-by: ssantos <ssantos@web.de>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/pt/
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/pt_PT/
Translation: F-Droid/F-Droid Server
2020-10-20 23:18:11 +02:00
Renaud Perrai
eb21b17959 Translated using Weblate: French (fr) by Renaud Perrai <contact@renaudperrai.fr>
Currently translated at 70.8% (403 of 569 strings)

Translated using Weblate: French (fr) by Renaud Perrai <contact@renaudperrai.fr>

Currently translated at 69.5% (396 of 569 strings)

Co-authored-by: Renaud Perrai <contact@renaudperrai.fr>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/fr/
Translation: F-Droid/F-Droid Server
2020-10-20 23:18:11 +02:00
Allan Nordhøy
47ad13e6e5 Translated using Weblate: Norwegian Bokmål (nb_NO) by Allan Nordhøy <epost@anotheragency.no>
Currently translated at 60.1% (342 of 569 strings)

Translated using Weblate: Norwegian Bokmål (nb_NO) by Allan Nordhøy <epost@anotheragency.no>

Currently translated at 60.1% (342 of 569 strings)

Co-authored-by: Allan Nordhøy <epost@anotheragency.no>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/nb_NO/
Translation: F-Droid/F-Droid Server
2020-10-20 23:18:11 +02:00
ihor_ck
790c385f9a Translated using Weblate: Ukrainian (uk) by ihor_ck <igor_ck@outlook.com>
Currently translated at 100.0% (569 of 569 strings)

Co-authored-by: ihor_ck <igor_ck@outlook.com>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/uk/
Translation: F-Droid/F-Droid Server
2020-10-20 23:18:11 +02:00
Eric
46e0ef09c1 Translated using Weblate: Chinese (Simplified) (zh_Hans) by Eric <spice2wolf@gmail.com>
Currently translated at 33.7% (192 of 569 strings)

Co-authored-by: Eric <spice2wolf@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/zh_Hans/
Translation: F-Droid/F-Droid Server
2020-10-20 23:18:11 +02:00
Oğuz Ersen
406a0ce8bc Translated using Weblate: Turkish (tr) by Oğuz Ersen <oguzersen@protonmail.com>
Currently translated at 100.0% (569 of 569 strings)

Co-authored-by: Oğuz Ersen <oguzersen@protonmail.com>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/tr/
Translation: F-Droid/F-Droid Server
2020-10-20 23:18:11 +02:00
Hosted Weblate
86932dbc21 Update translation files
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Co-authored-by: Hosted Weblate <hosted@weblate.org>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/
Translation: F-Droid/F-Droid Server
2020-10-20 23:18:11 +02:00