kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-18 20:50:10 +01:00
Code Activity
5,423 Commits 1 Branch 59 Tags 43 MiB
9c900ed63c
Commit Graph

5423 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hans-Christoph Steiner
568256f75c Merge branch 'apt_get_update' into 'master' 
provisioners: work around apt-get update problem

See merge request fdroid/fdroidserver!590
 2018-10-24 11:53:24 +00:00
Marcus Hoffmann
10e3165e41 provisioners: work around apt-get update problem 2018-10-24 13:06:27 +02:00
Marcus
15d422b01b Merge branch 'ndk18' into 'master' 
Add NDK r18b

See merge request fdroid/fdroidserver!588
 2018-10-22 16:31:57 +00:00
Licaon_Kter
210c62f136 Add NDK r18b 2018-10-22 16:31:57 +00:00
Hans-Christoph Steiner
ff578dae30 Merge branch 'utf8-fixes' into 'master' 
UTF-8 fixes

See merge request fdroid/fdroidserver!587
 2018-10-19 14:00:00 +00:00
Hans-Christoph Steiner
117d63cca5 update: use 'replace' mode to handle non-UTF8 description files 
Fastlane/Triple-T app store metadata files must be in UTF-8.  Before this
would crash if they were not.  This changes the handling to just replace
the non-UTF8 chars with a �.  Here's the stacktrace:

CRITICAL: Unknown exception found!
Traceback (most recent call last):
  File "/var/lib/jenkins/userContent/reproducible/reproducible_fdroid_build_apps/fdroid", line 164, in <module>
    main()
  File "/var/lib/jenkins/userContent/reproducible/reproducible_fdroid_build_apps/fdroid", line 159, in main
    raise e
  File "/var/lib/jenkins/userContent/reproducible/reproducible_fdroid_build_apps/fdroid", line 138, in main
    mod.main()
  File "/var/lib/jenkins/userContent/reproducible/reproducible_fdroid_build_apps/fdroidserver/update.py", line 2010, in main
    insert_localized_app_metadata(apps)
  File "/var/lib/jenkins/userContent/reproducible/reproducible_fdroid_build_apps/fdroidserver/update.py", line 885, in insert_localized_app_metadata
    os.path.join(root, f))
  File "/var/lib/jenkins/userContent/reproducible/reproducible_fdroid_build_apps/fdroidserver/update.py", line 700, in _set_localized_text_entry
    text = fp.read()[:limit]
  File "/usr/lib/python3.5/codecs.py", line 321, in decode
    (result, consumed) = self._buffer_decode(data, self.errors, final)
UnicodeDecodeError: 'utf-8' codec can't decode byte 0xfc in position 94: invalid start byte
 2018-10-19 15:06:16 +02:00
Hans-Christoph Steiner
57556aceee remove redundant open() arg: encoding='utf8' 
By default, open() returns a str:
https://docs.python.org/3/library/functions.html#open

By default, str is UTF-8:
https://docs.python.org/3/library/stdtypes.html#str

This used to matter on Python 2.x, but this code is 3.x only now.
 2018-10-19 15:01:34 +02:00
Hans-Christoph Steiner
6e5d1a6cc3 jenkins: another attempt to force the locale to a more standard one 2018-10-17 17:17:16 +02:00
Hans-Christoph Steiner
92bf9315e6 Merge branch 'verifiy-basebox' into 'master' 
* verifiy-basebox:
  jenkins: switch to using auto-downloaded and verified basebox
  makebuildserver: verify stretch basebox

fdroid/fdroidserver!581
 2018-10-17 17:04:16 +02:00
Hans-Christoph Steiner
9dff760d07 jenkins: switch to using auto-downloaded and verified basebox 2018-10-17 17:02:21 +02:00
Hans-Christoph Steiner
ceb3f6631b Merge branch 'update-import-fixups' into 'master' 
update/import fixups

Closes #548 and #472

See merge request fdroid/fdroidserver!584
 2018-10-12 12:59:43 +00:00
Michael Pöhn
9a85f0007c Merge branch 'use-libvirt-defaults' into 'master' 
buildserver: only set disk_bus/nic_model_type if set in config file

See merge request fdroid/fdroidserver!586
 2018-10-11 10:32:19 +00:00
Hans-Christoph Steiner
3b0c8fe669 buildserver: only set disk_bus/nic_model_type if set in config file 
This makes vagrant/KVM just use the default if these are not set in the
makebuildserver.config.py.

fdroid/fdroidserver!585
 2018-10-11 12:11:15 +02:00
Hans-Christoph Steiner
9458a69c54 Merge branch 'libvirt-virtio-config' into 'master' 
makebuildserver: options for disk and network hardware emulation

See merge request fdroid/fdroidserver!585
 2018-10-11 10:07:29 +00:00
Hans-Christoph Steiner
e591a73b82 update bash completion for fdroid import 2018-10-11 12:02:22 +02:00
Hans-Christoph Steiner
1d13bbf6b6 import: ensure categories from CLI flag are always a list 
categories must always be a list in YAML  closes #472
 2018-10-11 11:59:42 +02:00
Michael Pöhn
d98d90ab90 makebuildserver: add config options for disk and network hardware emulation 2018-10-11 11:30:46 +02:00
Michael Pöhn
493a767d14 makebuildserver: verify stretch basebox 2018-10-11 09:56:46 +02:00
Hans-Christoph Steiner
bfdf581201 import: use valid placeholder values for versionCode/versionName 
fdroid/fdroidserver!559
closes fdroid/fdroidserver#548
 2018-10-10 16:02:34 +02:00
Michael Pöhn
aea2589c67 metadata: remove redundant build flags list creation 
picked out of fdroid/fdroidserver!559
 2018-10-10 16:02:34 +02:00
Michael Pöhn
67e46694d3 add test for allowing to write placeholder values to yaml metadata files 2018-10-10 16:02:34 +02:00
Hans-Christoph Steiner
3bea689f74 add another lint field type test case 2018-10-10 16:02:34 +02:00
Hans-Christoph Steiner
e33c1c74b1 tests: include info.zwanenburg.caffeinetile in index tests 2018-10-10 16:02:34 +02:00
Hans-Christoph Steiner
8b251da79f update: do not set targetSdkVersion if the APK is missing it 
699b3e4c69 got it wrong for targetSdkVersion.
Also, one confusing thing is that aapt outputs "sdkVersion: '3'" for
com.politedroid_3.apk but no "sdkVersion:" for no.min.target.sdk_987.apk.
F-Droid never really supported running on android-1 or android-2, so it
seems pointless to debug support for them.
 2018-10-10 15:29:02 +02:00
Hans-Christoph Steiner
2a9bc448ee Merge branch 'enforce-list-data-types' into 'master' 
Enforce list data types

Closes #578

See merge request fdroid/fdroidserver!583
 2018-10-10 12:39:29 +00:00
Hans-Christoph Steiner
58b14279af rewritemeta: rewrite AntiFeature str entries like Categories 2018-10-09 23:49:27 +02:00
Hans-Christoph Steiner
6e6afeec65 unset Categories should be empty by default, not ['None'] 
This is an ancient, bizarre vestige.  This makes the TYPE_LIST fields
behave the same, e.g. AntiFeatures and Categories.
 2018-10-09 23:39:09 +02:00
Hans-Christoph Steiner
85993eb2f8 lint: check fields for proper type, e.g. list vs. string 
fdroid/fdroidserver#578
 2018-10-09 23:31:24 +02:00
Hans-Christoph Steiner
2113e29082 throw error on ancient, obsolete BuildVersion/UseBuilt metadata fields 2018-10-09 22:23:42 +02:00
Michael Pöhn
019ec6d4ba Merge branch 'fix-appid-checks' into 'master' 
fix Application ID checks

See merge request fdroid/fdroidserver!582
 2018-09-25 10:50:16 +00:00
Hans-Christoph Steiner
d2216b756b fix typos in strings 2018-09-24 17:09:15 +02:00
Hans-Christoph Steiner
6b57cb6b7c fix strict Application ID checks 
* upper case letters are allowed at all positions
* there must be a "." separator
 2018-09-24 17:07:27 +02:00
Hans-Christoph Steiner
6cf8fec057 update: correct error message about Android AppID 2018-09-24 17:07:27 +02:00
Hans-Christoph Steiner
ecb6987cda jenkins: ensure valid locale is set before running 
This prevents the dreaded "Content is not allowed in prolog" errors when
running gradle.  C.UTF-8 is a Debian thing that is not supported everywhere
including Java.

fdroid/basebox#9
 2018-09-24 12:15:46 +02:00
Hans-Christoph Steiner
6d842b8429 Merge branch 'androguard-optimizations' into 'master' 
androguard optimizations

Closes #557

See merge request fdroid/fdroidserver!577
 2018-09-21 14:59:23 +00:00
Hans-Christoph Steiner
11d46072ab use androguard primitives to speed up finding debuggable flag 
androguard parses the whole APK before handing the instance back, this uses
the primitives to just find the <application android:debuggable=""> value,
then stop parsing.

#557
 2018-09-21 14:56:46 +02:00
Hans-Christoph Steiner
a3cecc16a3 use partial androguard binary XML parsing to speed up APK ID lookup 
Normally, androguard parses the entire APK before it is possible to get any
values from it.  This uses androguard primitives to only attempt to parse
the AndroidManifest.xml, then to quit as soon as it gets what it needs.
This greatly speeds up the parsing (1 minute vs 60 minutes).

fdroid/fdroidserver#557
 2018-09-21 14:56:46 +02:00
Hans-Christoph Steiner
fa09337b4b APK_ID_TRIPLET_REGEX only matches first line of aapt output 
Stop expensive aapt parsing after the first line when looking with
APK_ID_TRIPLET_REGEX.  As is seen with the `aapt dump badging` output files
in tests/build-tools/, the first line is the only line that will ever match.

#557
 2018-09-21 14:56:32 +02:00
Hans-Christoph Steiner
f11b2e8d45 point out the easy way to generate the locale files 
fdroid/fdroidserver!560
fdroid/fdroidserver#546
 2018-09-21 14:56:32 +02:00
Hans-Christoph Steiner
5c6097f9e0 Merge branch 'gradle-4.10.2' into 'master' 
makebuildserver: add Gradle 4.10.2

See merge request fdroid/fdroidserver!580
 2018-09-21 06:49:01 +00:00
relan
bf0501797f makebuildserver: add Gradle 4.10.2 2018-09-21 07:38:27 +03:00
Hans-Christoph Steiner
2272bab4f1 Merge branch 'fix-locale-setup' into 'master' 
generate all po files

See merge request fdroid/fdroidserver!560
 2018-09-20 09:37:09 +00:00
Hans-Christoph Steiner
d2f850e2df jenkins: switch to box name as generated by basebox project 2018-09-19 23:41:34 +02:00
Hans-Christoph Steiner
39c339e5a1 jenkins: force local basebox, do not download from Vagrant Cloud 
Until we have a verification process for boxes downloaded from Vagrant
Cloud, the official setup uses a locally generated basebox.
 2018-09-19 16:48:00 +02:00
Hans-Christoph Steiner
ee509782a2 buildserver: apt-transport-https needs ca-certificates 
ca-certificates is set as Recommends: but for our use cases it is required
since without it, standard CA-signed certs fail to validate.
 2018-09-19 16:48:00 +02:00
Hans-Christoph Steiner
d9e9cc20aa gitlab-ci: install python3-defusedxml in debian_testing and ubuntu_lts 
fdroid/fdroidserver!578
 2018-09-19 16:48:00 +02:00
Hans-Christoph Steiner
ffcd8c3bd4 Merge branch 'gradle-4.10.1' into 'master' 
add gradle 4.10.1 to makebuildserver and gradlew-fdroid

Closes #569

See merge request fdroid/fdroidserver!579
 2018-09-19 06:30:11 +00:00
Michael Pöhn
7c9c1d4aaf add gradle 4.10.1 to makebuildserver and gradlew-fdroid 2018-09-19 00:03:01 +02:00
Hans-Christoph Steiner
d3bf347a97 Merge branch 'update-basebox-to-fdroid-basebox-stretch64' into 'master' 
update basebox to fdroid/basebox-stretch64

See merge request fdroid/fdroidserver!576
 2018-09-18 12:59:44 +00:00
Michael Pöhn
4af9199c92 update basebox to fdroid/basebox-stretch64 2018-09-18 12:50:22 +02:00