mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-03 17:50:11 +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:
commit
375f68480c
@ -274,6 +274,7 @@ fedora_latest:
|
|||||||
git
|
git
|
||||||
gnupg
|
gnupg
|
||||||
java-17-openjdk-devel
|
java-17-openjdk-devel
|
||||||
|
openssl
|
||||||
python3
|
python3
|
||||||
python3-babel
|
python3-babel
|
||||||
python3-matplotlib
|
python3-matplotlib
|
||||||
|
@ -246,7 +246,14 @@ class NightlyTest(unittest.TestCase):
|
|||||||
):
|
):
|
||||||
self.assertTrue(self.testroot == Path.home().parent)
|
self.assertTrue(self.testroot == Path.home().parent)
|
||||||
with patch('subprocess.check_call', _subprocess_check_call):
|
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.assertEqual(called, [['ssh', '-Tvi'], ['fdroid', 'deploy']])
|
||||||
self.assertFalse(os.path.exists('config.py'))
|
self.assertFalse(os.path.exists('config.py'))
|
||||||
git_url = 'git@github.com:f-droid/test-nightly'
|
git_url = 'git@github.com:f-droid/test-nightly'
|
||||||
@ -314,7 +321,14 @@ class NightlyTest(unittest.TestCase):
|
|||||||
):
|
):
|
||||||
self.assertTrue(self.testroot == Path.home().parent)
|
self.assertTrue(self.testroot == Path.home().parent)
|
||||||
with patch('subprocess.check_call', _subprocess_check_call):
|
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.assertEqual(called, [['ssh', '-Tvi'], ['fdroid', 'deploy']])
|
||||||
self.assertFalse(os.path.exists('config.py'))
|
self.assertFalse(os.path.exists('config.py'))
|
||||||
expected = {
|
expected = {
|
||||||
|
Loading…
Reference in New Issue
Block a user