From 4d838cf4de3522b9ee42e761860d388c9fdbad33 Mon Sep 17 00:00:00 2001 From: Veloman Yunkan Date: Tue, 17 Dec 2024 11:43:31 +0400 Subject: [PATCH 1/2] Fixed a bug in kiwix-desktop's source publishing step The bug was there since 2018. It's strange that it didn't cause problems with previous releases. The most plausible explanation is that this is the first time when the sources of kiwix-desktop are being published via this procedure. --- kiwixbuild/dependencies/base.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kiwixbuild/dependencies/base.py b/kiwixbuild/dependencies/base.py index 45d0422..29f2081 100644 --- a/kiwixbuild/dependencies/base.py +++ b/kiwixbuild/dependencies/base.py @@ -524,8 +524,8 @@ class QMakeBuilder(MakeBuilder): *neutralEnv("git_command"), "archive", "-o", - f"{self.build_path}/{self.target_full_name()}.tar.gz", - f"--prefix={self.target_full_name()}/", + f"{self.build_path}/{self.target.full_name()}.tar.gz", + f"--prefix={self.target.full_name()}/", "HEAD", ] run_command(command, self.source_path, context) From a5a6ba1c52467007d62e86e3e1b027270968567b Mon Sep 17 00:00:00 2001 From: Veloman Yunkan Date: Tue, 17 Dec 2024 17:48:44 +0400 Subject: [PATCH 2/2] Fixed kiwix-desktop Windows package name generation --- .github/scripts/common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/common.py b/.github/scripts/common.py index baa40c5..8b931ff 100644 --- a/.github/scripts/common.py +++ b/.github/scripts/common.py @@ -544,7 +544,7 @@ def create_desktop_image(make_release): elif platform.system() == "Windows": archive_basename = "kiwix-desktop_windows_x64_{}".format(postfix) working_dir = INSTALL_DIR / archive_basename - build_path = working_dir + ".zip" + build_path = Path(str(working_dir) + ".zip") app_name = build_path.name command = [ "python",