1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-04 14:30:11 +01:00

gitlab-ci: install biplist if available, otherwise skip test_parse_ipa

Fedora does not have a biplist package.
This commit is contained in:
Hans-Christoph Steiner 2024-01-11 15:56:42 +01:00
parent 6eee83db47
commit dc7170e709
2 changed files with 16 additions and 2 deletions

View File

@ -99,6 +99,7 @@ debian_testing:
git git
gnupg gnupg
ipfs-cid ipfs-cid
python3-biplist
python3-defusedxml python3-defusedxml
python3-pycountry python3-pycountry
python3-setuptools python3-setuptools
@ -124,7 +125,14 @@ ubuntu_lts_ppa:
- echo "deb http://ppa.launchpad.net/fdroid/fdroidserver/ubuntu $RELEASE main" >> /etc/apt/sources.list - echo "deb http://ppa.launchpad.net/fdroid/fdroidserver/ubuntu $RELEASE main" >> /etc/apt/sources.list
- apt-get update - apt-get update
- apt-get dist-upgrade - apt-get dist-upgrade
- apt-get install --install-recommends dexdump fdroidserver git python3-pycountry python3-setuptools sdkmanager - apt-get install --install-recommends
dexdump
fdroidserver
git
python3-biplist
python3-pycountry
python3-setuptools
sdkmanager
# Test things work with a default branch other than 'master' # Test things work with a default branch other than 'master'
- git config --global init.defaultBranch thisisnotmasterormain - git config --global init.defaultBranch thisisnotmasterormain
@ -350,7 +358,7 @@ macOS:
- /bin/bash -n gradlew-fdroid tests/run-tests - /bin/bash -n gradlew-fdroid tests/run-tests
# TODO remove the packages below once they are included in the Homebrew package # TODO remove the packages below once they are included in the Homebrew package
- $(brew --prefix fdroidserver)/libexec/bin/python3 -m pip install pycountry - $(brew --prefix fdroidserver)/libexec/bin/python3 -m pip install biplist pycountry
# test fdroidserver from git with current package's dependencies # test fdroidserver from git with current package's dependencies
- fdroid="$(brew --prefix fdroidserver)/libexec/bin/python3 $PWD/fdroid" ./tests/run-tests - fdroid="$(brew --prefix fdroidserver)/libexec/bin/python3 $PWD/fdroid" ./tests/run-tests

View File

@ -1935,6 +1935,12 @@ class UpdateTest(unittest.TestCase):
) )
def test_parse_ipa(self): def test_parse_ipa(self):
try:
import biplist # Fedora does not have a biplist package
biplist # silence the linters
except ImportError as e:
self.skipTest(str(e))
ipa_path = os.path.join( ipa_path = os.path.join(
os.path.dirname(os.path.abspath(__file__)), os.path.dirname(os.path.abspath(__file__)),
'com.fake.IpaApp_1000000000001.ipa', 'com.fake.IpaApp_1000000000001.ipa',