From a93b3c889602a79cf07c9a3b779c17c49249512d Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Mon, 8 Apr 2024 16:53:17 +0200 Subject: [PATCH] Remove the `2` in base_deps name --- .github/scripts/common.py | 4 ++-- .github/scripts/ensure_base_deps.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/scripts/common.py b/.github/scripts/common.py index cb668ef..8eff925 100644 --- a/.github/scripts/common.py +++ b/.github/scripts/common.py @@ -284,8 +284,8 @@ def filter_install_dir(path): yield sub_dir -# Full: True if we are creating a full archive to be used as cache by kiwix-build (base_deps2_{os}_{config}_{base_deps_version}.tar.xz) -# Full: False if we are creating a archive to be used as pre-cached dependencies for project's CI (deps2_{os}_{config}_{target}.tar.xz) +# Full: True if we are creating a full archive to be used as cache by kiwix-build (base_deps_{os}_{config}_{base_deps_version}.tar.xz) +# Full: False if we are creating a archive to be used as pre-cached dependencies for project's CI (deps_{config}_{target}.tar.xz) def make_deps_archive(target=None, name=None, full=False): archive_name = name or "deps_{}_{}.tar.xz".format( get_dependency_archive_name(), target diff --git a/.github/scripts/ensure_base_deps.py b/.github/scripts/ensure_base_deps.py index 0995f9a..f900d78 100755 --- a/.github/scripts/ensure_base_deps.py +++ b/.github/scripts/ensure_base_deps.py @@ -32,10 +32,10 @@ def download_base_archive(base_name): return file_path -ARCHIVE_NAME_TEMPLATE = "base_deps2_{os}_{config}_{version}.tar.xz" +ARCHIVE_NAME_TEMPLATE = "base_deps_{os}_{config}_{version}.tar.xz" if COMPILE_CONFIG == "flatpak": - base_dep_archive_name = "base_deps2_flatpak.tar.xz" + base_dep_archive_name = "base_deps_flatpak.tar.xz" else: base_dep_archive_name = ARCHIVE_NAME_TEMPLATE.format( os=OS_NAME,