Remove the `2` in base_deps name
This commit is contained in:
parent
0d27cbd8cf
commit
a93b3c8896
|
@ -284,8 +284,8 @@ def filter_install_dir(path):
|
||||||
yield sub_dir
|
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: 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 (deps2_{os}_{config}_{target}.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):
|
def make_deps_archive(target=None, name=None, full=False):
|
||||||
archive_name = name or "deps_{}_{}.tar.xz".format(
|
archive_name = name or "deps_{}_{}.tar.xz".format(
|
||||||
get_dependency_archive_name(), target
|
get_dependency_archive_name(), target
|
||||||
|
|
|
@ -32,10 +32,10 @@ def download_base_archive(base_name):
|
||||||
return file_path
|
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":
|
if COMPILE_CONFIG == "flatpak":
|
||||||
base_dep_archive_name = "base_deps2_flatpak.tar.xz"
|
base_dep_archive_name = "base_deps_flatpak.tar.xz"
|
||||||
else:
|
else:
|
||||||
base_dep_archive_name = ARCHIVE_NAME_TEMPLATE.format(
|
base_dep_archive_name = ARCHIVE_NAME_TEMPLATE.format(
|
||||||
os=OS_NAME,
|
os=OS_NAME,
|
||||||
|
|
Loading…
Reference in New Issue