From d76819390e4b025f27c90ad5ecb97d9e5e627d9f Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Thu, 22 Dec 2022 14:31:20 +0100 Subject: [PATCH 1/2] Do not always fallback to master. --- kiwixbuild/dependencies/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kiwixbuild/dependencies/base.py b/kiwixbuild/dependencies/base.py index 1688623..b901ab5 100644 --- a/kiwixbuild/dependencies/base.py +++ b/kiwixbuild/dependencies/base.py @@ -142,7 +142,7 @@ class GitClone(Source): @property def release_git_ref(self): - return main_project_versions.get(self.name, "master") + return main_project_versions.get(self.name, self.base_git_ref) @property def source_dir(self): From 344b9328c3aa4eb21554729f5d64f1c1792657c9 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Thu, 22 Dec 2022 14:32:13 +0100 Subject: [PATCH 2/2] libzim and zim-tools are now using "main" for the default branch. --- kiwixbuild/dependencies/libzim.py | 1 + kiwixbuild/dependencies/zim_tools.py | 1 + 2 files changed, 2 insertions(+) diff --git a/kiwixbuild/dependencies/libzim.py b/kiwixbuild/dependencies/libzim.py index a7688c2..7a00d06 100644 --- a/kiwixbuild/dependencies/libzim.py +++ b/kiwixbuild/dependencies/libzim.py @@ -11,6 +11,7 @@ class Libzim(Dependency): class Source(GitClone): git_remote = "https://github.com/openzim/libzim.git" git_dir = "libzim" + base_git_ref = "main" class Builder(MesonBuilder): test_option = "-t 8" diff --git a/kiwixbuild/dependencies/zim_tools.py b/kiwixbuild/dependencies/zim_tools.py index 4c67504..97c626d 100644 --- a/kiwixbuild/dependencies/zim_tools.py +++ b/kiwixbuild/dependencies/zim_tools.py @@ -10,6 +10,7 @@ class ZimTools(Dependency): class Source(GitClone): git_remote = "https://github.com/openzim/zim-tools.git" git_dir = "zim-tools" + base_git_ref = "main" class Builder(MesonBuilder): @classmethod