1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-07-04 16:30:12 +02:00

Merge branch 'fix_fedora_ci' into 'master'

CI: Add missing dependency on Fedora

See merge request fdroid/fdroidserver!1263
This commit is contained in:
Hans-Christoph Steiner 2023-02-08 17:34:01 +00:00
commit 375f68480c
2 changed files with 17 additions and 2 deletions

View File

@ -274,6 +274,7 @@ fedora_latest:
git
gnupg
java-17-openjdk-devel
openssl
python3
python3-babel
python3-matplotlib

View File

@ -246,7 +246,14 @@ class NightlyTest(unittest.TestCase):
):
self.assertTrue(self.testroot == Path.home().parent)
with patch('subprocess.check_call', _subprocess_check_call):
nightly.main()
try:
nightly.main()
except exception.BuildException as e:
if "apksigner not found" in e.value:
self.skipTest("skipping, apksigner not found due to fake $HOME")
else:
raise
self.assertEqual(called, [['ssh', '-Tvi'], ['fdroid', 'deploy']])
self.assertFalse(os.path.exists('config.py'))
git_url = 'git@github.com:f-droid/test-nightly'
@ -314,7 +321,14 @@ class NightlyTest(unittest.TestCase):
):
self.assertTrue(self.testroot == Path.home().parent)
with patch('subprocess.check_call', _subprocess_check_call):
nightly.main()
try:
nightly.main()
except exception.BuildException as e:
if "apksigner not found" in e.value:
self.skipTest("skipping, apksigner not found due to fake $HOME")
else:
raise
self.assertEqual(called, [['ssh', '-Tvi'], ['fdroid', 'deploy']])
self.assertFalse(os.path.exists('config.py'))
expected = {