From 00f5ff876224ac036ce58846aaf62170e9f35e4c Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Mon, 30 Nov 2020 11:22:45 +0100
Subject: [PATCH] gitlab-ci: remove workaround, Debian's apksigner now works
 w/o binfmt

---
 .gitlab-ci.yml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dc82c2e4..101ef314 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -78,16 +78,14 @@ debian_testing:
         python3-defusedxml
         python3-setuptools
         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 androguard'
     - cd 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:
   image: ubuntu:latest
   <<: *apt-template
@@ -109,7 +107,6 @@ ubuntu_lts_ppa:
     - ./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
   <<: *apt-template