diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1669e016..cbc87721 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -57,12 +57,14 @@ debian_testing: - ./run-tests # test using LTS set up with the PPA, including Recommends -ubuntu_lts: +ubuntu_lts_ppa: image: ubuntu:latest only: - master@fdroid/fdroidserver variables: + ANDROID_HOME: /usr/lib/android-sdk DEBIAN_FRONTEND: noninteractive + LANG: C.UTF-8 script: - echo Etc/UTC > /etc/timezone - apt-get -qy update @@ -72,13 +74,13 @@ ubuntu_lts: - echo "deb http://ppa.launchpad.net/fdroid/fdroidserver/ubuntu $RELEASE main" >> /etc/apt/sources.list - apt-get -qy update - apt-get -qy dist-upgrade - - apt-get -qy install --install-recommends fdroidserver git python3-defusedxml python3-setuptools - - export ANDROID_HOME=/usr/lib/android-sdk - - export LANG=C.UTF-8 + - apt-get -qy install --install-recommends binfmt-support fdroidserver git python3-defusedxml python3-setuptools + - grep binfmt /proc/modules || apt -qy purge apksigner - cd tests - ./run-tests # test using Xenial LTS with all depends from pypi +# apksigner is recommended, but requires binfmt support in the kernel ubuntu_xenial_pip: image: ubuntu:xenial only: