mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-11-09 00:40:11 +01:00
Merge branch 'fix_v4_signing' into 'master'
Work around old apksigner on f-droid.org publish server See merge request fdroid/fdroidserver!1192
This commit is contained in:
commit
e239a600a3
@ -102,6 +102,27 @@ debian_testing:
|
||||
- ./run-tests
|
||||
|
||||
|
||||
# This tests with buster-backports to match what is used on the f-droid.org publish server.
|
||||
buster_backports:
|
||||
image: debian:buster-backports
|
||||
<<: *apt-template
|
||||
script:
|
||||
- apt-get install
|
||||
aapt
|
||||
androguard
|
||||
apksigner
|
||||
dexdump
|
||||
fdroidserver
|
||||
git
|
||||
gnupg
|
||||
python3-defusedxml
|
||||
python3-setuptools
|
||||
zipalign
|
||||
- apt-get install -t buster-backports apksigner
|
||||
- cd tests
|
||||
- ./run-tests
|
||||
|
||||
|
||||
# Test using latest LTS set up with the PPA, including Recommends.
|
||||
ubuntu_lts_ppa:
|
||||
image: ubuntu:latest
|
||||
|
@ -85,7 +85,8 @@ FDROID_PATH = os.path.realpath(os.path.join(os.path.dirname(__file__), '..'))
|
||||
# this is the build-tools version, aapt has a separate version that
|
||||
# has to be manually set in test_aapt_version()
|
||||
MINIMUM_AAPT_BUILD_TOOLS_VERSION = '26.0.0'
|
||||
# 30.0.0 is the first version to support --v4-signing-enabled.
|
||||
# 31.0.0 is the first version to support --v4-signing-enabled.
|
||||
# we only require 30.0.0 for now as that's the version in buster-backports, see also signindex.py
|
||||
# 26.0.2 is the first version recognizing md5 based signatures as valid again
|
||||
# (as does android, so we want that)
|
||||
MINIMUM_APKSIGNER_BUILD_TOOLS_VERSION = '30.0.0'
|
||||
|
@ -110,6 +110,12 @@ def sign_jar(jar, use_old_algs=False):
|
||||
'FDROID_KEY_PASS': config.get('keypass', ""),
|
||||
}
|
||||
p = common.FDroidPopen(args, envs=env_vars)
|
||||
if p.returncode != 0:
|
||||
# workaround for buster-backports apksigner on f-droid.org publish server
|
||||
v4 = args.index("--v4-signing-enabled")
|
||||
del args[v4 + 1]
|
||||
del args[v4]
|
||||
p = common.FDroidPopen(args, envs=env_vars)
|
||||
if p.returncode != 0:
|
||||
raise FDroidException("Failed to sign %s: %s" % (jar, p.output))
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user