smallsolar
/
kiwix-build
mirror of https://github.com/kiwix/kiwix-build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #739 from kiwix/no_cache_release

This commit is contained in:
Matthieu Gautier 2024-08-29 11:15:53 +02:00 committed by GitHub
parent c17c2f274c 69358afe0b
commit 21176bcf82
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.github/scripts/ensure_base_deps.py vendored
View File

@ -15,6 +15,7 @@ from common import (
HOME, HOME,
COMPILE_CONFIG, COMPILE_CONFIG,
OS_NAME, OS_NAME,
MAKE_RELEASE,
) )
@ -32,17 +33,21 @@ def download_base_archive(base_name):
return file_path return file_path
def get_archive_name():
ARCHIVE_NAME_TEMPLATE = "base_deps_{os}_{config}_{version}.tar.gz" ARCHIVE_NAME_TEMPLATE = "base_deps_{os}_{config}_{version}.tar.gz"
if COMPILE_CONFIG == "flatpak": if COMPILE_CONFIG == "flatpak":
base_dep_archive_name = "base_deps_flatpak.tar.gz" return "base_deps_flatpak.tar.gz"
else:
base_dep_archive_name = ARCHIVE_NAME_TEMPLATE.format( return ARCHIVE_NAME_TEMPLATE.format(
os=OS_NAME, os=OS_NAME,
config=COMPILE_CONFIG, config=COMPILE_CONFIG,
version=base_deps_meta_version, version=base_deps_meta_version,
) )
def main():
base_dep_archive_name = get_archive_name()
print_message("Getting archive {}", base_dep_archive_name) print_message("Getting archive {}", base_dep_archive_name)
try: try:
local_filename = download_base_archive(base_dep_archive_name) local_filename = download_base_archive(base_dep_archive_name)
@ -58,3 +63,10 @@ except URLError:
archive_file = make_deps_archive(name=base_dep_archive_name, full=True) archive_file = make_deps_archive(name=base_dep_archive_name, full=True)
upload(archive_file, "ci@tmp.kiwix.org:30022", "/data/tmp/ci") upload(archive_file, "ci@tmp.kiwix.org:30022", "/data/tmp/ci")
os.remove(str(archive_file)) os.remove(str(archive_file))
if __name__ == "__main__":
if MAKE_RELEASE:
print_message("We are building release. Don't download deps archive.")
else:
main()

2
kiwixbuild/versions.py
View File

@ -29,7 +29,7 @@ main_project_versions = {
# - set KIWIX_DESKTOP_RELEASE to 0 # - set KIWIX_DESKTOP_RELEASE to 0
release_versions = { release_versions = {
"libzim": 0, # Depends of base deps (was 0) "libzim": 1, # Depends of base deps (was 0)
"libkiwix": None, # Depends of libzim (was 4) "libkiwix": None, # Depends of libzim (was 4)
"kiwix-tools": None, # Depends of libkiwix and libzim (was 2) "kiwix-tools": None, # Depends of libkiwix and libzim (was 2)
"zim-tools": None, # Depends of libzim (was 0) "zim-tools": None, # Depends of libzim (was 0)