From f04af445ddad344fb5a3b70b540e3120ee353d03 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Wed, 8 Jun 2022 18:23:39 +0200
Subject: [PATCH] gitlab-ci: upgrade 'servergitmirrors' job to
 Debian/bullseye-backports

apksigner is now a requirement !1134
---
 .gitlab-ci.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 48a27f72..4c5140ad 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -445,7 +445,7 @@ plugin_fetchsrclibs:
 
 # test a full update and deploy cycle to gitlab.com
 servergitmirrors:
-  image: debian:buster
+  image: debian:bullseye-backports
   <<: *apt-template
   only:
     - master@fdroid/fdroidserver
@@ -462,12 +462,15 @@ servergitmirrors:
         python3-pil
         python3-pip
         python3-pycparser
+        python3-setuptools
         python3-venv
         rsync
         wget
+    - apt-get install -t bullseye-backports apksigner
     - python3 -m venv --system-site-packages env
     - . env/bin/activate
     - export PYTHONPATH=`pwd`
+    - export SETUPTOOLS_USE_DISTUTILS=stdlib # https://github.com/pypa/setuptools/issues/2956
     - $pip install -e .
     - mkdir /root/.ssh/
     - ./tests/key-tricks.py