From 20c299358d500c8e255a7dc5d378844e976f8d3c Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 24 Mar 2021 11:20:00 +0100 Subject: [PATCH] gitlab-ci: modernize ubuntu_lts_ppa job using updates to PPA The PPA now provides apksigner that does not need binfmt, and defusedxml is a hard Depends:. --- .gitlab-ci.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5a40719f..ebd4cff1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -89,8 +89,6 @@ debian_testing: - ./run-tests # Test using latest LTS set up with the PPA, including Recommends. -# focal's apksigner, which comes from Recommends:, requires binfmt -# support in the kernel. ubuntu_lts_ppa: image: ubuntu:latest <<: *apt-template @@ -104,10 +102,7 @@ ubuntu_lts_ppa: - echo "deb http://ppa.launchpad.net/fdroid/fdroidserver/ubuntu $RELEASE main" >> /etc/apt/sources.list - apt-get update - apt-get dist-upgrade - - mount | grep binfmt_misc || mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc - - apt-get install --install-recommends binfmt-support fdroidserver git python3-defusedxml python3-setuptools - - ls -l /proc/sys/fs/binfmt_misc || true - - test -e /proc/sys/fs/binfmt_misc/jarwrapper || apt -qy purge apksigner + - apt-get install --install-recommends fdroidserver git python3-setuptools - cd tests - ./run-tests