From e04dd76ee05cc2c0817adcc2f4feda82773f8714 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Mon, 4 Mar 2019 14:09:50 +0100 Subject: [PATCH] Use specific release base deps archive when build release. Base deps are not compiled the same between a release and debug build. --- travis/compile_all.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/travis/compile_all.py b/travis/compile_all.py index 4ff6ff8..920cb9d 100755 --- a/travis/compile_all.py +++ b/travis/compile_all.py @@ -278,10 +278,11 @@ def download_base_archive(base_name): if PLATFORM != 'flatpak': # 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.xz".format( + base_dep_archive_name = "base_deps_{os}_{platform}_{version}_{release}.tar.xz".format( os=TRAVIS_OS_NAME, platform=PLATFORM, - version=base_deps_meta_version) + version=base_deps_meta_version, + release='release' if make_release else 'debug') print_message("Getting archive {}", base_dep_archive_name) try: @@ -292,10 +293,11 @@ if PLATFORM != 'flatpak': print_message("Cannot get archive. Build dependencies") if PLATFORM == 'android': for arch in ('arm', 'arm64', 'x86', 'x86_64'): - archive_name = "base_deps_{os}_android_{arch}_{version}.tar.xz".format( + archive_name = "base_deps_{os}_android_{arch}_{version}_{release}.tar.xz".format( os=TRAVIS_OS_NAME, arch=arch, - version=base_deps_meta_version) + version=base_deps_meta_version, + release='release' if make_release else 'debug') print_message("Getting archive {}", archive_name) try: local_filename = download_base_archive(archive_name)