From 594099a10cafbd4076fd3534ba95cd860284cfd7 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Mon, 20 Jan 2025 15:28:25 +0100
Subject: [PATCH 1/2] gitlab-ci: remove arch_pip_install job

https://gitlab.com/fdroid/fdroidserver/-/jobs/8898887965

It broke and no one seems to want to maintain it.
---
 .gitlab-ci.yml | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 27455c75..87036d60 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -183,21 +183,6 @@ ubuntu_jammy_pip:
     - LANGUAGE='de' fdroid --help | grep 'Gültige Befehle sind'
 
 
-# test installation process on a bleeding edge distro with pip
-arch_pip_install:
-  image: archlinux
-  only:
-    - master@fdroid/fdroidserver
-  script:
-    - pacman --sync --sysupgrade --refresh --noconfirm gcc git grep python-pip python-virtualenv python-wheel tar
-    - python -m venv venv
-    - source venv/bin/activate
-    - pip install -e .[test]
-    - fdroid
-    - fdroid readmeta
-    - fdroid update --help
-
-
 # The gradlew-fdroid tests are isolated from the rest of the test
 # suite, so they run as their own job.
 gradlew-fdroid:

From 9b5a67340e7acc5a44391e33c3e9b8ab56674808 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Mon, 20 Jan 2025 15:37:54 +0100
Subject: [PATCH 2/2] checkupdates: skip test_get_upstream_main_branch on macOS

This test checks the detection of the default initial branch. It is a hard
thing to test since different platform configurations have different
defaults.  checkupdates is basically only used on GNU/Linux anyway.

Here's the failure:
https://gitlab.com/fdroid/fdroidserver/-/jobs/8896420261
---
 tests/test_checkupdates.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/test_checkupdates.py b/tests/test_checkupdates.py
index 87420d2b..fcd6f642 100755
--- a/tests/test_checkupdates.py
+++ b/tests/test_checkupdates.py
@@ -2,6 +2,7 @@
 
 import git
 import os
+import platform
 import shutil
 import tempfile
 import time
@@ -490,6 +491,10 @@ class CheckupdatesTest(unittest.TestCase):
                 fdroidserver.checkupdates.main()
         sys_exit.assert_not_called()
 
+    @unittest.skipIf(
+        platform.system() == 'Darwin',
+        'It is difficult to configure the base system for this test.',
+    )
     def test_get_upstream_main_branch(self):
         os.chdir(self.testdir.name)
         testvalue = 'foo'