From 81f02b82798b5e4cdf767857b3182114c51db0af Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Wed, 19 Oct 2022 13:18:03 +0200
Subject: [PATCH 1/4] gitlab-ci: fix apt.conf syntax for Acquire::Retries

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 90b6341d..d48cd3ae 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -70,8 +70,8 @@ metadata_v0:
     - echo Etc/UTC > /etc/timezone
     - echo 'APT::Install-Recommends "0";'
            'APT::Install-Suggests "0";'
-           'APT::Acquire::Retries "20";'
            'APT::Get::Assume-Yes "true";'
+           'Acquire::Retries "20";'
            'Dpkg::Use-Pty "0";'
            'quiet "1";'
         >> /etc/apt/apt.conf.d/99gitlab

From eafa7f5e70a50650b9b302b17a03ec89f43035a2 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Wed, 19 Oct 2022 14:00:16 +0200
Subject: [PATCH 2/4] gitlab-ci: delete buster_backports job, prod signing is
 on bullseye

Via private email with @CiaranG
---
 .gitlab-ci.yml | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d48cd3ae..69060c2e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -107,27 +107,6 @@ debian_testing:
     - ./run-tests
 
 
-# This tests with buster-backports to match what is used on the f-droid.org publish server. 
-buster_backports:
-  image: debian:buster-backports
-  <<: *apt-template
-  script:
-    - apt-get install
-        aapt
-        androguard
-        apksigner
-        dexdump
-        fdroidserver
-        git
-        gnupg
-        python3-defusedxml
-        python3-setuptools
-        zipalign
-    - apt-get install -t buster-backports apksigner
-    - cd tests
-    - ./run-tests
-
-
 # Test using latest LTS set up with the PPA, including Recommends.
 ubuntu_lts_ppa:
   image: ubuntu:latest

From 2bde06a60f03bce4a109933998f8730136c68dad Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Wed, 19 Oct 2022 13:55:41 +0200
Subject: [PATCH 3/4] gitlab-ci: port ubuntu_bionic_pip to Ubuntu/jammy

This job is here to test using fdroidserver with only depends from pip
and sdkmanager (e.g. not apt-get).  Production is now on bullseye #1038
---
 .gitlab-ci.yml | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 69060c2e..555e2fd3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -126,16 +126,16 @@ ubuntu_lts_ppa:
     - ./run-tests
 
 
-# Test using Ubuntu/bionic LTS (supported til April, 2023) with all depends
-# from pypi.  The venv is used to isolate the dist tarball generation
-# environment from the clean install environment.
-ubuntu_bionic_pip:
-  image: ubuntu:bionic
+# Test using Ubuntu/jammy LTS (supported til April, 2027) with depends
+# from pypi and sdkmanager.  The venv is used to isolate the dist
+# tarball generation environment from the clean install environment.
+ubuntu_jammy_pip:
+  image: ubuntu:jammy
   <<: *apt-template
   script:
-    - apt-get install git default-jdk-headless python3-pip python3-venv rsync zipalign libarchive13 dexdump
+    - apt-get install git default-jdk-headless python3-pip python3-venv rsync
     - rm -rf env
-    - pyvenv env
+    - python3 -m venv env
     - . env/bin/activate
     - $pip install --upgrade babel pip setuptools
     # setup venv to act as release build machine
@@ -145,8 +145,6 @@ ubuntu_bionic_pip:
     - deactivate
     - tar tzf dist/fdroidserver-*.tar.gz
     # back to bare machine to act as user's install machine
-    - $pip install --upgrade pip setuptools wheel  # make this go away: "error: invalid command 'bdist_wheel'"
-
     - export ANDROID_HOME=/opt/android-sdk
     - $pip install sdkmanager
     - sdkmanager 'build-tools;30.0.0'

From 2b5c35829f575d6d581815805ed42f8b9238c036 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Thu, 20 Oct 2022 16:41:59 +0200
Subject: [PATCH 4/4] tests/run-tests: fix "fatal: transport 'file' not
 allowed"

https://gitlab.com/eighthave/fdroidserver/-/jobs/3202418899
---
 tests/run-tests | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/run-tests b/tests/run-tests
index 408c72a2..e5349dc8 100755
--- a/tests/run-tests
+++ b/tests/run-tests
@@ -1303,6 +1303,9 @@ fi
 #------------------------------------------------------------------------------#
 echo_header "Test recovering from from broken git submodules"
 
+# On some platforms, checkupdates submodule tests need explicit perms to use file:///
+export GIT_ALLOW_PROTOCOL=file
+
 ROOT=$(create_test_dir)
 cd "$ROOT"
 mkdir foo bar
@@ -1425,6 +1428,7 @@ EOF
 $fdroid checkupdates --allow-dirty --auto -v
 grep "CurrentVersionCode: 1" metadata/fake.yml
 
+unset GIT_ALLOW_PROTOCOL
 
 #------------------------------------------------------------------------------#