mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-14 06:52:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

gitlab-ci: remove workaround, Debian's apksigner now works w/o binfmt

Browse source
This commit is contained in:
Hans-Christoph Steiner 2020-11-30 11:22:45 +01:00
parent 381190faad
commit 00f5ff8762
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
.gitlab-ci.yml
View file

@ -78,16 +78,14 @@ debian_testing:
python3-defusedxml python3-defusedxml
python3-setuptools python3-setuptools
zipalign zipalign
# Debian has apksigner depend on binfmt support which isn't very docker friendly
# We create a shell wrapper instead
- echo -e '#!/bin/sh\njava -jar /usr/lib/android-sdk/build-tools/debian/apksigner.jar "$@"' > /usr/local/bin/apksigner
- chmod +x /usr/local/bin/apksigner
- python3 -c 'import fdroidserver' - python3 -c 'import fdroidserver'
- python3 -c 'import androguard' - python3 -c 'import androguard'
- cd tests - cd tests
- ./run-tests - ./run-tests
# test using LTS set up with the PPA, including Recommends # Test using latest LTS set up with the PPA, including Recommends.
# bionic's apksigner, which comes from Recommends:, requires binfmt
# support in the kernel.
ubuntu_lts_ppa: ubuntu_lts_ppa:
image: ubuntu:latest image: ubuntu:latest
<<: *apt-template <<: *apt-template
@ -109,7 +107,6 @@ ubuntu_lts_ppa:
- ./run-tests - ./run-tests
# test using Xenial LTS with all depends from pypi # test using Xenial LTS with all depends from pypi
# apksigner is recommended, but requires binfmt support in the kernel
ubuntu_xenial_pip: ubuntu_xenial_pip:
image: ubuntu:xenial image: ubuntu:xenial
<<: *apt-template <<: *apt-template