From 56d897d8d82ea29118afec37161623bd98b669e9 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Mon, 16 Jul 2018 09:42:14 +0200 Subject: [PATCH] [TRAVIS] Allways use $HOME as relative path in dependencies archives. As we now move to multi-arch build, we may have things compiled natively or "neutral" (as toolchains). So we cannot use the BASE_DIR as relative_path because BASE_DIR is arch dependent. --- travis/compile_all.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/travis/compile_all.py b/travis/compile_all.py index fc308c2..f195e94 100755 --- a/travis/compile_all.py +++ b/travis/compile_all.py @@ -180,7 +180,7 @@ def make_deps_archive(target, full=False): write_manifest(manifest_file, archive_name, target, PLATFORM) files_to_archive.append(manifest_file) - relative_path = BASE_DIR + relative_path = HOME if full: files_to_archive += ARCHIVE_DIR.glob(".*_ok") files_to_archive += BASE_DIR.glob('*/.*_ok') @@ -193,7 +193,6 @@ def make_deps_archive(target, full=False): files_to_archive += HOME.glob('BUILD_*/pugixml-{}'.format( base_deps_versions['pugixml'])) files_to_archive += HOME.glob('**/TOOLCHAINS') - relative_path = HOME counter = 50 with tarfile.open(str(relative_path/archive_name), 'w:gz') as tar: