mirror/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2026-05-19 06:02:54 -04:00
Code Issues Packages Projects Releases Wiki Activity
6,287 Commits 1 Branch 71 Tags
ce10fcb7591c49aa747404294f2b71fe7243098e
Commit Graph

6287 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jochen Sprickerhof
ce10fcb759 Check if build_tools path exists before listdir 2020-11-29 10:06:39 +01:00
Hans-Christoph Steiner
1c7df94e76 purge unneeded 'build_tools' config option 
Back when fdroidserver was built around aapt, that was needed to
guarantee that a compatible version of aapt was used. Now, aapt is
only optionally used for getting the APK ID, so this was just
complicating maintenance.
 2020-11-29 10:06:39 +01:00
Jochen Sprickerhof
1e8093ff6e Revert "find_sdk_tools_cmd returns non if aapt is not found" 
This reverts commit 66414a9fc7.
 2020-11-29 10:06:39 +01:00
Hans-Christoph Steiner
2cca336a29 add gradle 6.7.1 2020-11-27 11:35:18 +01:00
Hans-Christoph Steiner
1a736c2314 Merge branch 'versionCode_underscore' into 'master' 
Support underscore (_) in versionCode

See merge request fdroid/fdroidserver!830
 2020-11-27 10:30:44 +00:00
Hans-Christoph Steiner
7f1aef0105 Merge branch 'missing_aapt' into 'master' 
Fix tests

See merge request fdroid/fdroidserver!831
 2020-11-27 09:57:49 +00:00
Jochen Sprickerhof
5c36f84430 Ignore non version number entries in build_tools_path 2020-11-26 23:31:20 +01:00
Jochen Sprickerhof
60748acb9d Add missing test files 2020-11-26 23:31:20 +01:00
Jochen Sprickerhof
66414a9fc7 find_sdk_tools_cmd returns non if aapt is not found 2020-11-26 22:52:52 +01:00
Jochen Sprickerhof
2cb0ff4578 Support underscore (_) in versionCode 
Example:

https://github.com/ubergeek42/weechat-android/blob/v1.3.1/app/build.gradle.kts#L67
 2020-11-26 21:03:51 +01:00
Hans-Christoph Steiner
393f88b41e second alpha 2.0 release 2.0a1 2.0a1 2020-11-25 17:45:00 +01:00
Alvaro
fda56302a3 Translated using Weblate: Spanish (es) by Alvaro <alvaro@null.net> 
Currently translated at 55.6% (319 of 573 strings)

Co-authored-by: Alvaro <alvaro@null.net>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/es/
Translation: F-Droid/F-Droid Server
 2020-11-25 17:43:04 +01:00
Roman
5eb5a65c19 Translated using Weblate: Russian (ru) by Roman <WT_Roma@mail.ru> 
Currently translated at 84.4% (484 of 573 strings)

Co-authored-by: Roman <WT_Roma@mail.ru>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/ru/
Translation: F-Droid/F-Droid Server
 2020-11-25 17:43:04 +01:00
Besnik Bleta
9c72e6f1a8 Translated using Weblate: Albanian (sq) by Besnik Bleta <besnik@programeshqip.org> 
Currently translated at 96.8% (555 of 573 strings)

Translated using Weblate: Albanian (sq) by Besnik Bleta <besnik@programeshqip.org>

Currently translated at 80.8% (463 of 573 strings)

Co-authored-by: Besnik Bleta <besnik@programeshqip.org>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/sq/
Translation: F-Droid/F-Droid Server
 2020-11-25 17:43:04 +01:00
Hans-Christoph Steiner
a6c3598466 Translated using Weblate: Albanian (sq) by Hans-Christoph Steiner <hans@guardianproject.info> 
Currently translated at 80.1% (459 of 573 strings)

Translated using Weblate: Hungarian (hu) by Hans-Christoph Steiner <hans@guardianproject.info>

Currently translated at 13.7% (79 of 573 strings)

Translated using Weblate: Swedish (sv) by Hans-Christoph Steiner <hans@guardianproject.info>

Currently translated at 7.5% (43 of 573 strings)

Translated using Weblate: Russian (ru) by Hans-Christoph Steiner <hans@guardianproject.info>

Currently translated at 84.2% (483 of 573 strings)

Translated using Weblate: Korean (ko) by Hans-Christoph Steiner <hans@guardianproject.info>

Currently translated at 36.1% (207 of 573 strings)

Translated using Weblate: Tibetan (bo) by Hans-Christoph Steiner <hans@guardianproject.info>

Currently translated at 67.8% (389 of 573 strings)

Translated using Weblate: German (de) by Hans-Christoph Steiner <hans@guardianproject.info>

Currently translated at 86.0% (493 of 573 strings)

Translated using Weblate: Spanish (es) by Hans-Christoph Steiner <hans@guardianproject.info>

Currently translated at 55.4% (318 of 573 strings)

Translated using Weblate: Chinese (Traditional) (zh_Hant) by Hans-Christoph Steiner <hans@guardianproject.info>

Currently translated at 82.7% (474 of 573 strings)

Translated using Weblate: Spanish (Argentina) (es_AR) by Hans-Christoph Steiner <hans@guardianproject.info>

Currently translated at 14.4% (83 of 573 strings)

Translated using Weblate: Albanian (sq) by Hans-Christoph Steiner <hans@guardianproject.info>

Currently translated at 80.1% (459 of 573 strings)

Translated using Weblate: Tibetan (bo) by Hans-Christoph Steiner <hans@guardianproject.info>

Currently translated at 67.7% (388 of 573 strings)

Translated using Weblate: German (de) by Hans-Christoph Steiner <hans@guardianproject.info>

Currently translated at 85.8% (492 of 573 strings)

Translated using Weblate: Spanish (es) by Hans-Christoph Steiner <hans@guardianproject.info>

Currently translated at 55.3% (317 of 573 strings)

Translated using Weblate: Chinese (Traditional) (zh_Hant) by Hans-Christoph Steiner <hans@guardianproject.info>

Currently translated at 82.5% (473 of 573 strings)

Co-authored-by: Hans-Christoph Steiner <hans@guardianproject.info>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/bo/
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/de/
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/es/
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/es_AR/
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/hu/
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/ko/
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/ru/
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/sq/
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/sv/
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/zh_Hant/
Translation: F-Droid/F-Droid Server
 2020-11-25 17:43:04 +01:00
The Cats
96faaf7d18 Translated using Weblate: Portuguese (Brazil) (pt_BR) by The Cats <philosoph@snopyta.org> 
Currently translated at 100.0% (573 of 573 strings)

Co-authored-by: The Cats <philosoph@snopyta.org>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/pt_BR/
Translation: F-Droid/F-Droid Server
 2020-11-25 17:43:04 +01:00
NightFeather
6d4527186a Translated using Weblate: Chinese (Traditional) (zh_Hant) by NightFeather <ss900328@gmail.com> 
Currently translated at 82.3% (472 of 573 strings)

Co-authored-by: NightFeather <ss900328@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/zh_Hant/
Translation: F-Droid/F-Droid Server
 2020-11-25 17:43:04 +01:00
Michal L
50a240c0ec Translated using Weblate: Polish (pl) by Michal L <michalrmsmi@wp.pl> 
Currently translated at 89.7% (514 of 573 strings)

Translated using Weblate: Polish (pl) by Michal L <michalrmsmi@wp.pl>

Currently translated at 89.5% (513 of 573 strings)

Translated using Weblate: Polish (pl) by Michal L <michalrmsmi@wp.pl>

Currently translated at 86.5% (496 of 573 strings)

Co-authored-by: Michal L <michalrmsmi@wp.pl>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/pl/
Translation: F-Droid/F-Droid Server
 2020-11-25 17:40:48 +01:00
ssantos
9b0537514e Translated using Weblate: Portuguese (pt) by ssantos <ssantos@web.de> 
Currently translated at 100.0% (573 of 573 strings)

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

Currently translated at 100.0% (573 of 573 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-11-25 17:40:47 +01:00
Ihor Hordiichuk
b660f32bf5 Translated using Weblate: Ukrainian (uk) by Ihor Hordiichuk <igor_ck@outlook.com> 
Currently translated at 100.0% (573 of 573 strings)

Co-authored-by: Ihor Hordiichuk <igor_ck@outlook.com>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/uk/
Translation: F-Droid/F-Droid Server
 2020-11-25 17:40:47 +01:00
Oğuz Ersen
277994b31d Translated using Weblate: Turkish (tr) by Oğuz Ersen <oguzersen@protonmail.com> 
Currently translated at 100.0% (573 of 573 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-11-25 17:40:46 +01:00
Hans-Christoph Steiner
fadbe30d81 Merge branch 'install_apk' into 'master' 
Add missing test apk

See merge request fdroid/fdroidserver!829
 2020-11-25 16:30:01 +00:00
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