kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-20 13:50:12 +01:00
Code Activity
4,455 Commits 1 Branch 59 Tags 44 MiB
36ef93520c
Commit Graph

4455 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcus Hoffmann
36ef93520c Merge branch 'mr/verify_ca_certs_v2' into 'master' 
makebuildserver: verify https all requests to avoid urllib3 warnings

See merge request !316
 2017-08-28 15:05:24 +00:00
Marcus Hoffmann
b81f14b8df Merge branch 'revert-af707cd1' into 'master' 
Revert "setup.py: don't use pyasn1 to 0.3.3 until pyasn1-modules is updated to support it"

See merge request !322
 2017-08-27 22:40:49 +00:00
Marcus Hoffmann
e38fc27cf1 Revert "setup.py: don't use pyasn1 to 0.3.3 until pyasn1-modules is updated to support it" 
This reverts commit af707cd1cb
 2017-08-27 22:07:49 +00:00
Marcus Hoffmann
af707cd1cb setup.py: don't use pyasn1 to 0.3.3 until pyasn1-modules is updated to support it 
Latest pyasn1-modules hard codes pyasn1-0.3.2, so this currently break our tests.
Ref: https://github.com/etingof/pyasn1-modules/issues/4
 2017-08-27 21:58:40 +00:00
Marcus Hoffmann
222b9251e7 Merge branch 'mr/update_platforms_tools' into 'master' 
makebuildserver: update platform and build tool releases

See merge request !317
 2017-08-27 19:41:16 +00:00
Michael Pöhn
794e4436b4 Merge branch 'local_metadata' into 'master' 
metadata: also read .fdroid.txt metadata

Closes #364

See merge request !319
 2017-08-22 16:46:07 +00:00
Marcus Hoffmann
a9a19527c7 metadata: also read .fdroid.txt metadata 
This is documented as working here:
https://f-droid.org/docs/Building_Applications/
(second to last paragraph)

fixes #364
 2017-08-22 00:03:43 +02:00
Marcus Hoffmann
69666839f7 makebuildserver: update platform and build tool releases 
Update platform-25 to r03
Update platform-26 to r02
Add build-tools_r26.0.1

sha256 signatures locally computed after verifying the sha1 signature provided
by the repository2-1.xml file.

All these will be downloaded and installed in the buildserver through
provision-android-sdk anyway but this adds them to the cache.
 2017-08-17 00:56:59 +02:00
Marcus Hoffmann
ae613ab277 makebuildserver: verify https all requests to avoid urllib3 warnings 
According to http://docs.python-requests.org/en/master/user/advanced/#ca-certificates
python-requests >= 2.4.0 will use the certifi provided certificates.
We already recommend installing python3-certifi in the docs.
On debian requests is patched to use the system trust store instead.
 2017-08-17 00:49:53 +02:00
Hans-Christoph Steiner
1955e2f153 Merge branch 'gradle-updates' into 'master' 
makebuildserver: add Gradle 3.5.1, 4.0.1, 4.0.2 and 4.1

See merge request !313
 2017-08-15 15:49:58 +00:00
Hans-Christoph Steiner
40b96ca60d Merge branch 'ndk-r15c' into 'master' 
makebuildserver: upgrade NDK r15b to r15c

See merge request !314
 2017-08-15 15:48:50 +00:00
relan
a09952ca2b makebuildserver: add Gradle 3.5.1, 4.0.1, 4.0.2 and 4.1 
Android Gradle plugin 3.0.0 requires Gradle 4.1.
 2017-08-14 08:53:57 +03:00
relan
6f05cf85f9 makebuildserver: upgrade NDK r15b to r15c 2017-08-11 10:19:40 +03:00
Hans-Christoph Steiner
c67f8e349c metadata: handle empty YAML files without crashing 
!311
 2017-07-26 18:21:28 -07:00
Hans-Christoph Steiner
7bd171480f update: test metadata creation using internal and external templates 
There is a hardcoded template in update.py, and there is also the
possibility for the user to create a template.yml.  This tests both of them
and cleans up the related code a bit.

#352 !310
 2017-07-26 15:34:13 -07:00
Hans-Christoph Steiner
96aacf1752 add missing comma in setup.py 2017-07-26 11:25:51 -07:00
Hans-Christoph Steiner
355b08262d Merge branch 'metadata' into 'master' 
preserve order and formatting on creating Metadata from Yaml template (closes #352)

Closes #352

See merge request !310
 2017-07-26 18:14:33 +00:00
Izzy
cbd420e490 preserve order and formatting on creating Metadata from Yaml template (closes #352) 2017-07-26 09:22:01 +02:00
Hans-Christoph Steiner
5eb85deeaf Bump to 0.8 2017-07-25 22:19:49 -07:00
Hans-Christoph Steiner
5feaafa1bd update pypi "classifiers" 2017-07-25 22:19:49 -07:00
Hans-Christoph Steiner
1e7832a4f4 update README to point to https://f-droid.org/docs 2017-07-25 22:19:48 -07:00
Hans-Christoph Steiner
c7034bfaea update file list in setup.py 2017-07-25 22:19:48 -07:00
Hans-Christoph Steiner
6dfdc78314 Merge branch 'metadata' into 'master' 
Updating syntax check for Flattr (see #284)

See merge request !309
 2017-07-26 05:06:42 +00:00
Izzy
b787ec9e34 Updating syntax check for Flattr (see #284) 2017-07-20 20:26:25 +02:00
Hans-Christoph Steiner
512688990f Merge branch '0.8-fixes' into 'master' 
0.8 fixes

Closes #325, #347, and #309

See merge request !304
 2017-07-20 03:58:27 +00:00
Hans-Christoph Steiner
c1e9379f67 remove errant trailing slash added in 7613c18dd8 2017-07-20 00:00:08 +02:00
Hans-Christoph Steiner
be523a3f1a include all test files in source tarball 2017-07-20 00:00:08 +02:00
Hans-Christoph Steiner
619c66e1dc gitlab-ci: filter new build fields in metadata_v0 test 2017-07-19 16:24:28 +02:00
Hans-Christoph Steiner
0a953814e2 update: always include name/summary/desc in index.xml if available 
With the new localization support, the name/summary/description in the
metadata file becomes the global override.  So most apps are not going to
have those fields present in their metadata file.  This fixes the index.xml
generation to fall back to the localized versions of those fields when they
are not set in the metadata field.

https://forum.f-droid.org/t/what-has-happend-to-osmand
 2017-07-19 15:07:50 +02:00
Hans-Christoph Steiner
f43da8cd14 add new files to MANIFEST.in 
They need to be there in order to be included in the source tarball.
 2017-07-19 15:07:50 +02:00
Hans-Christoph Steiner
3e67634a27 wp-droid: move deprecated Wordpress plugin to its own repo 
closes #325
 2017-07-19 15:07:50 +02:00
Hans-Christoph Steiner
7613c18dd8 verify: if downloading from /repo/ fails, try /archive/ 
The Builds entries in metadata/ files do not easily say whether a
given APK is in the repo/ or the archive/.  So it should also try to
download the official APK from the archive/ when verifying.
 2017-07-19 15:07:50 +02:00
Hans-Christoph Steiner
67d98c5a36 keep .apk file ext when diffoscope'ing Binaries: 2017-07-19 15:07:50 +02:00
Hans-Christoph Steiner
2ecaf6ef8d rewritemeta: only print file type if its changing 2017-07-19 15:07:50 +02:00
Hans-Christoph Steiner
1f7f9d403c server: report errors pushing to git mirrors 
This makes `fdroid server update` fail if pushing to one of the git mirrors
fails.  This is what happens if the other methods fail, e.g. rsync or S3.

closes #347
 2017-07-19 15:07:50 +02:00
Hans-Christoph Steiner
93caf27319 server: include gitlab raw URLs as git mirrors 
gitlab serves raw files from a CDN, so its appropriate to use the raw URL.
@pserwylo @grote and I discussed it and found a reference, but I can't find
that reference now.

Since the client will try the next mirror if one fails, it makes sense to
include both the gitlab raw and gitlab pages URLs to the mirror.  The
gitlab pages deploy process is still a bit flaky anyway.
 2017-07-19 15:07:50 +02:00
Hans-Christoph Steiner
6d8e916491 server: only rm git mirror if the git history is getting too large 
git hosts like github, gitlab, bitbucket usually allow 1 gig repos. This
changes the git mirroring behavior to keep the history until the repo hits
1 gig.  Keeping history makes updates a lot faster, since the whole repo
does not need to be pushed on each update.
 2017-07-19 13:03:17 +02:00
Hans-Christoph Steiner
d8954fc033 update: force checkout .gitlab-ci.yml when updating git mirrors 
closes #309
 2017-07-17 11:38:15 +02:00
Hans-Christoph Steiner
523b5f4777 server: smooth out btlog transfer for offline signing setups 
It turns out it is error prone to `git push` to a non-bare git repo. For
the offline signing machine, the git remote needs to be a regular git repo
in a directory on a thumbdrive so that once the thumbdrive is plugged into
an online machine, that git repo can be transferred to the online machine.
 2017-07-17 11:38:15 +02:00
Hans-Christoph Steiner
be8e7830e1 Merge branch 'xmlicons' into 'master' 
have fallback for XML icons also consider res/mipmap*

See merge request !307
 2017-07-17 06:33:02 +00:00
Izzy
54a646bd93 have fallback for XML icons also consider res/mipmap* 
several apps (e.g.
[FastHub](http://apt.qumran.org/fdroid/index/apk/com.fastaccess.github)
and [Monety](http://apt.qumran.org/fdroid/index/apk/open.currency)) have
their ic_launcher.png files not in res/drawable*dpi/, but in
res/mipmap*/ -- so the regex has been adjusted by this patch.

Additionally: if the only icon for a given resolution was an XML without
existing fallback-PNG, it should be considered "non existent" (ie.
"empty_density").
 2017-07-17 00:54:33 +02:00
Hans-Christoph Steiner
6940f9da43 Merge branch 'metadata' into 'master' 
adding example metadata template (closes #345)

Closes #345

See merge request !306
 2017-07-16 14:21:46 +00:00
Izzy
fc114dfd63 using a "real category" as example 2017-07-15 17:22:18 +02:00
Izzy
c644d0c3c8 adding example metadata template (closes #345) 2017-07-15 16:52:08 +02:00
Hans-Christoph Steiner
830e788401 Merge branch 'metadata' into 'master' 
--create-metadata: use yaml.dump() and (if exists) template.yml

See merge request !305
 2017-07-10 09:08:45 +00:00
Izzy
dd69490821 --create-metadata: only set default empty values if not using template.py 2017-07-08 14:41:19 +02:00
Izzy
4d375a585d enable user to have presets for metadata by using a template.yml (see #345) 2017-07-08 14:21:49 +02:00
Izzy
732de91aa7 make --create-metadata use yaml.dump instead of ruamel (solves #345) 2017-07-08 14:07:11 +02:00
Hans-Christoph Steiner
25f96e1911 ensure that mirror URLs always include the repodir 
Since the mirror URLs are per repo section (repo/archive), the mirror URLs
must include the repodir at the end.  This was missing for servergitmirrors

found by @cde when working on fdroidclient#35
 2017-07-07 15:50:11 +02:00
Hans-Christoph Steiner
70858bb104 Merge branch 'master' into 'master' 
Also search for apk in build/outputs/apk/release

See merge request !303
 2017-07-07 11:02:32 +00:00