diff --git a/.github/scripts/common.py b/.github/scripts/common.py index fbea65d..74709a3 100644 --- a/.github/scripts/common.py +++ b/.github/scripts/common.py @@ -281,8 +281,9 @@ def make_deps_archive(target=None, name=None, full=False): print_message("Create archive {}.", archive_name) files_to_archive = list(filter_install_dir(INSTALL_DIR)) files_to_archive += HOME.glob("BUILD_*/LOGS") - if PLATFORM_TARGET == "native_mixed": - files_to_archive += filter_install_dir(HOME / "BUILD_native_static" / "INSTALL") + if PLATFORM_TARGET.endswith("_mixed"): + static_platform = PLATFORM_TARGET.replace("_mixed", "_static") + files_to_archive += filter_install_dir(HOME / ("BUILD_" + static_platform) / "INSTALL") if PLATFORM_TARGET.startswith("android_"): files_to_archive += filter_install_dir(HOME / "BUILD_neutral" / "INSTALL") base_dir = HOME / "BUILD_{}".format(PLATFORM_TARGET) @@ -301,6 +302,11 @@ def make_deps_archive(target=None, name=None, full=False): if full: files_to_archive += ARCHIVE_DIR.glob(".*_ok") files_to_archive += BASE_DIR.glob("*/.*_ok") + # Add also static build for mixed target + if PLATFORM_TARGET.endswith("_mixed"): + static_platform = PLATFORM_TARGET.replace("_mixed", "_static") + files_to_archive += (HOME / ("BUILD_" + static_platform)).glob("*/.*_ok") + # Native dyn and static is needed for potential cross compilation that use native tools (icu) files_to_archive += (HOME / "BUILD_native_dyn").glob("*/.*_ok") files_to_archive += (HOME / "BUILD_native_static").glob("*/.*_ok") files_to_archive += HOME.glob("BUILD_android*/**/.*_ok")