Get base dependencies only if we are not building a flatpak.
This commit is contained in:
parent
ce540ca280
commit
f41a0dccdb
|
@ -249,19 +249,20 @@ for p in (NIGHTLY_KIWIX_ARCHIVES_DIR,
|
||||||
|
|
||||||
make_release = re.fullmatch(r"[0-9]+\.[0-9]+\.[0-9]+", environ.get('TRAVIS_TAG', '')) is not None
|
make_release = re.fullmatch(r"[0-9]+\.[0-9]+\.[0-9]+", environ.get('TRAVIS_TAG', '')) is not None
|
||||||
|
|
||||||
# The first thing we need to do is to (potentially) download already compiled base dependencies.
|
if PLATFORM != 'flatpak':
|
||||||
base_dep_archive_name = "base_deps_{os}_{platform}_{version}.tar.gz".format(
|
# The first thing we need to do is to (potentially) download already compiled base dependencies.
|
||||||
|
base_dep_archive_name = "base_deps_{os}_{platform}_{version}.tar.gz".format(
|
||||||
os=TRAVIS_OS_NAME,
|
os=TRAVIS_OS_NAME,
|
||||||
platform=PLATFORM,
|
platform=PLATFORM,
|
||||||
version=base_deps_meta_version)
|
version=base_deps_meta_version)
|
||||||
|
|
||||||
print_message("Getting archive {}", base_dep_archive_name)
|
print_message("Getting archive {}", base_dep_archive_name)
|
||||||
try:
|
try:
|
||||||
local_filename, _ = urlretrieve(
|
local_filename, _ = urlretrieve(
|
||||||
'http://tmp.kiwix.org/ci/{}'.format(base_dep_archive_name))
|
'http://tmp.kiwix.org/ci/{}'.format(base_dep_archive_name))
|
||||||
with tarfile.open(local_filename) as f:
|
with tarfile.open(local_filename) as f:
|
||||||
f.extractall(str(HOME))
|
f.extractall(str(HOME))
|
||||||
except URLError:
|
except URLError:
|
||||||
print_message("Cannot get archive. Build dependencies")
|
print_message("Cannot get archive. Build dependencies")
|
||||||
if PLATFORM == 'android':
|
if PLATFORM == 'android':
|
||||||
for arch in ('arm', 'arm64', 'x86', 'x86_64'):
|
for arch in ('arm', 'arm64', 'x86', 'x86_64'):
|
||||||
|
|
Loading…
Reference in New Issue