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

Add build.binary

Browse Source
This commit is contained in:
linsui 2023-02-04 20:26:24 +08:00
parent 68e27c0a9b
commit 58f167b7e5
9 changed files with 116 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitlab-ci.yml
View File

@ -64,6 +64,7 @@ metadata_v0:
-e 's/VercodeOperation:.\([^[]\+\)/VercodeOperation:\n- \1/'
-e '/LiberapayID/d'
-e '/postbuild/d'
-e '/binary:/d'
metadata/dump_*/*.yaml
- diff -uw metadata/dump_*

3
fdroidserver/build.py
View File

@ -1143,7 +1143,7 @@ def main():
tools_version_log = ''.join(f.readlines())
os.remove(toolslog)
if app.Binaries is not None:
if url := build.binary or app.Binaries:
# This is an app where we build from source, and
# verify the APK contents against a developer's
# binary. We get that binary now, and save it
@ -1155,7 +1155,6 @@ def main():
"developer supplied reference "
"binaries: '{path}'"
.format(path=binaries_dir))
url = app.Binaries
url = url.replace('%v', build.versionName)
url = url.replace('%c', str(build.versionCode))
logging.info("...retrieving " + url)

1
fdroidserver/common.py
View File

@ -710,6 +710,7 @@ def read_pkg_args(appid_versionCode_pairs, allow_vercodes=False):
apk_regex = re.compile(r'_(\d+)\.apk$')
for p in appid_versionCode_pairs:
# Convert the apk name to a appid:versioncode pair
p = apk_regex.sub(r':\1', p)
if allow_vercodes and ':' in p:
package, vercode = p.split(':')

2
fdroidserver/metadata.py
View File

@ -227,6 +227,7 @@ build_flags = [
'maven',
'buildozer',
'output',
'binary',
'srclibs',
'oldsdkloc',
'encoding',
@ -267,6 +268,7 @@ class Build(dict):
self.maven = False
self.buildozer = False
self.output = None
self.binary = None
self.srclibs = []
self.oldsdkloc = False
self.encoding = None

6
fdroidserver/publish.py
View File

@ -346,7 +346,11 @@ def main():
sys.exit(1)
app = allapps[appid]
if app.Binaries:
build = None
for b in app.get("Builds", ()):
if b.get("versionCode") == vercode:
build = b
if app.Binaries or (build and build.binary):
# It's an app where we build from source, and verify the apk
# contents against a developer's binary, and then publish their

4
tests/metadata/dump/com.politedroid.yaml
View File

@ -15,6 +15,7 @@ Builds:
- KnownVuln
- UpstreamNonFree
- NonFreeAssets
binary: null
build: ''
buildjni: []
buildozer: false
@ -50,6 +51,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build: ''
buildjni: []
buildozer: false
@ -85,6 +87,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build: ''
buildjni: []
buildozer: false
@ -120,6 +123,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build: ''
buildjni: []
buildozer: false

28
tests/metadata/dump/org.adaway.yaml
View File

@ -12,6 +12,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build: ''
buildjni:
- 'yes'
@ -48,6 +49,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build: ''
buildjni:
- 'yes'
@ -85,6 +87,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build: ''
buildjni:
- 'yes'
@ -122,6 +125,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build: ''
buildjni:
- 'yes'
@ -159,6 +163,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build: ''
buildjni:
- 'yes'
@ -196,6 +201,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build: ''
buildjni:
- 'yes'
@ -233,6 +239,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build: ''
buildjni: []
buildozer: false
@ -268,6 +275,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build: ''
buildjni:
- 'yes'
@ -305,6 +313,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build: ''
buildjni:
- 'yes'
@ -342,6 +351,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build: ''
buildjni:
- 'yes'
@ -379,6 +389,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build: ''
buildjni:
- 'yes'
@ -416,6 +427,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build: ''
buildjni:
- 'yes'
@ -454,6 +466,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build: ''
buildjni: []
buildozer: false
@ -492,6 +505,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build: ''
buildjni: []
buildozer: false
@ -529,6 +543,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build: ''
buildjni: []
buildozer: false
@ -567,6 +582,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build: ''
buildjni: []
buildozer: false
@ -605,6 +621,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build: ''
buildjni: []
buildozer: false
@ -643,6 +660,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build: ''
buildjni: []
buildozer: false
@ -685,6 +703,7 @@ Builds:
- android-libs/HtmlSpanner/htmlspanner
antcommands: []
antifeatures: []
binary: null
build: ''
buildjni:
- 'yes'
@ -735,6 +754,7 @@ Builds:
- android-libs/HtmlSpanner/htmlspanner
antcommands: []
antifeatures: []
binary: null
build: ''
buildjni:
- 'yes'
@ -781,6 +801,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build: ''
buildjni:
- 'yes'
@ -819,6 +840,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build: ''
buildjni:
- 'yes'
@ -857,6 +879,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build: ''
buildjni:
- 'yes'
@ -895,6 +918,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build: ''
buildjni:
- 'yes'
@ -933,6 +957,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build: ''
buildjni:
- 'yes'
@ -971,6 +996,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build: ''
buildjni:
- 'yes'
@ -1009,6 +1035,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build: ''
buildjni:
- 'yes'
@ -1047,6 +1074,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build: ''
buildjni:
- 'yes'

8
tests/metadata/dump/org.smssecure.smssecure.yaml
View File

@ -12,6 +12,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build: ''
buildjni: []
buildozer: false
@ -73,6 +74,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build: ''
buildjni: []
buildozer: false
@ -116,6 +118,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build: ''
buildjni: []
buildozer: false
@ -157,6 +160,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build: ''
buildjni: []
buildozer: false
@ -198,6 +202,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build: ''
buildjni: []
buildozer: false
@ -238,6 +243,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build: ''
buildjni: []
buildozer: false
@ -278,6 +284,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build: ''
buildjni: []
buildozer: false
@ -318,6 +325,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build: ''
buildjni: []
buildozer: false

66
tests/metadata/dump/org.videolan.vlc.yaml
View File

@ -15,6 +15,7 @@ Builds:
- ../java-libs/ActionBarSherlock
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
buildjni: []
@ -55,6 +56,7 @@ Builds:
- ../java-libs/ActionBarSherlock
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ANDROID_ABI=armeabi ./compile.sh release
buildjni: []
@ -95,6 +97,7 @@ Builds:
- ../java-libs/ActionBarSherlock
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ANDROID_ABI=x86 ./compile.sh release
buildjni: []
@ -135,6 +138,7 @@ Builds:
- ../java-libs/ActionBarSherlock
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ANDROID_ABI=mips ./compile.sh release
buildjni: []
@ -172,6 +176,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ANDROID_ABI=mips ./compile.sh release
buildjni: []
@ -211,6 +216,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ANDROID_ABI=x86 ./compile.sh release
buildjni: []
@ -250,6 +256,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ANDROID_ABI=armeabi ./compile.sh release
buildjni: []
@ -289,6 +296,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
buildjni: []
@ -328,6 +336,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ANDROID_ABI=x86 ./compile.sh release
buildjni: []
@ -366,6 +375,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
buildjni: []
@ -404,6 +414,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ANDROID_ABI=x86 ./compile.sh release
buildjni: []
@ -442,6 +453,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
buildjni: []
@ -480,6 +492,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ANDROID_ABI=x86 ./compile.sh release
buildjni: []
@ -518,6 +531,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
buildjni: []
@ -556,6 +570,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ANDROID_ABI=x86 ./compile.sh release
buildjni: []
@ -594,6 +609,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
buildjni: []
@ -632,6 +648,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ANDROID_ABI=x86 ./compile.sh release
buildjni: []
@ -670,6 +687,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
buildjni: []
@ -708,6 +726,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ANDROID_ABI=mips ./compile.sh release
buildjni: []
@ -746,6 +765,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ANDROID_ABI=x86 ./compile.sh release
buildjni: []
@ -784,6 +804,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
buildjni: []
@ -822,6 +843,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ANDROID_ABI=x86 ./compile.sh release
buildjni: []
@ -860,6 +882,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ANDROID_ABI=armeabi ./compile.sh release
buildjni: []
@ -898,6 +921,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
buildjni: []
@ -936,6 +960,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ANDROID_ABI=x86 ./compile.sh release
buildjni: []
@ -974,6 +999,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ANDROID_ABI=armeabi ./compile.sh release
buildjni: []
@ -1012,6 +1038,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
buildjni: []
@ -1050,6 +1077,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ANDROID_ABI=x86 ./compile.sh release
buildjni: []
@ -1088,6 +1116,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ANDROID_ABI=armeabi ./compile.sh release
buildjni: []
@ -1126,6 +1155,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
buildjni: []
@ -1164,6 +1194,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ANDROID_ABI=x86 ./compile.sh release
buildjni: []
@ -1202,6 +1233,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ANDROID_ABI=armeabi ./compile.sh release
buildjni: []
@ -1240,6 +1272,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
buildjni: []
@ -1278,6 +1311,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ANDROID_ABI=x86 ./compile.sh release
buildjni: []
@ -1316,6 +1350,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ANDROID_ABI=armeabi ./compile.sh release
buildjni: []
@ -1354,6 +1389,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
buildjni: []
@ -1392,6 +1428,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ./compile.sh -a "armeabi" --release
buildjni: []
@ -1432,6 +1469,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ./compile.sh -a "armeabi-v7a" --release
buildjni: []
@ -1472,6 +1510,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ./compile.sh -a "x86" --release
buildjni: []
@ -1512,6 +1551,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ./compile.sh -a "armeabi" --release
buildjni: []
@ -1552,6 +1592,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ./compile.sh -a "armeabi-v7a" --release
buildjni: []
@ -1592,6 +1633,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ./compile.sh -a "x86" --release
buildjni: []
@ -1632,6 +1674,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ./compile.sh -a "armeabi" --release
buildjni: []
@ -1672,6 +1715,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ./compile.sh -a "armeabi-v7a" --release
buildjni: []
@ -1712,6 +1756,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ./compile.sh -a "x86" --release
buildjni: []
@ -1752,6 +1797,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ./compile.sh -a "armeabi" --release
buildjni: []
@ -1792,6 +1838,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ./compile.sh -a "armeabi-v7a" --release
buildjni: []
@ -1832,6 +1879,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ./compile.sh -a "x86" --release
buildjni: []
@ -1872,6 +1920,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ./compile.sh -a "armeabi" --release
buildjni: []
@ -1912,6 +1961,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ./compile.sh -a "armeabi-v7a" --release
buildjni: []
@ -1952,6 +2002,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ./compile.sh -a "x86" --release
buildjni: []
@ -1992,6 +2043,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ./compile.sh -a "armeabi" --release
buildjni: []
@ -2032,6 +2084,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ./compile.sh -a "armeabi-v7a" --release
buildjni: []
@ -2072,6 +2125,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ./compile.sh -a "x86" --release
buildjni: []
@ -2112,6 +2166,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ./compile.sh -a "armeabi" --release
buildjni: []
@ -2152,6 +2207,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ./compile.sh -a "armeabi-v7a" --release
buildjni: []
@ -2192,6 +2248,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ./compile.sh -a "x86" --release
buildjni: []
@ -2232,6 +2289,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ./compile.sh -a "armeabi" --release
buildjni: []
@ -2272,6 +2330,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ./compile.sh -a "armeabi-v7a" --release
buildjni: []
@ -2312,6 +2371,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ./compile.sh -a "x86" --release
buildjni: []
@ -2352,6 +2412,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ./compile.sh -a "armeabi" --release
buildjni: []
@ -2392,6 +2453,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ./compile.sh -a "armeabi-v7a" --release
buildjni: []
@ -2432,6 +2494,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ./compile.sh -a "x86" --release
buildjni: []
@ -2472,6 +2535,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ./compile.sh -a "armeabi" --release
buildjni: []
@ -2512,6 +2576,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ./compile.sh -a "armeabi-v7a" --release
buildjni: []
@ -2552,6 +2617,7 @@ Builds:
- androidupdate: []
antcommands: []
antifeatures: []
binary: null
build:
- cd ../ && ./compile.sh -a "x86" --release
buildjni: []