From 37e2b709f80535c8a4baab2dec0692e625c5b3e4 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Mon, 18 Jun 2018 17:54:44 +0200 Subject: [PATCH 1/2] [TRAVIS] Use target_only only if we are building in a cron. The deps will be build only if we are in a cron. In this case, we can directly build only the target. But in other case, we have to build the target and its dependencies. --- travis/compile_all.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis/compile_all.py b/travis/compile_all.py index 683ecbf..dba1881 100755 --- a/travis/compile_all.py +++ b/travis/compile_all.py @@ -289,7 +289,7 @@ for target in TARGETS: run_kiwix_build(target, platform=PLATFORM, make_release=make_release, - target_only=True) + target_only=environ['TRAVIS_EVENT_TYPE'] == 'cron') if target == 'kiwix-desktop': create_app_image() if make_release and PLATFORM == 'native_dyn': From d076c6b8d74f1ef17db5958194d681a2d7022459 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Mon, 18 Jun 2018 17:56:13 +0200 Subject: [PATCH 2/2] Do not set zimwriterfs version directly in the dependency. The version is tracked in `kiwixbuild/versions.py`, so we must no set it in `kiwixbuild/dependencies/zimwriterfs.py`. --- kiwixbuild/dependencies/zimwriterfs.py | 1 - 1 file changed, 1 deletion(-) diff --git a/kiwixbuild/dependencies/zimwriterfs.py b/kiwixbuild/dependencies/zimwriterfs.py index 3ac977c..55f73a5 100644 --- a/kiwixbuild/dependencies/zimwriterfs.py +++ b/kiwixbuild/dependencies/zimwriterfs.py @@ -9,7 +9,6 @@ class Zimwriterfs(Dependency): class Source(GitClone): git_remote = "https://github.com/openzim/zimwriterfs.git" git_dir = "zimwriterfs" - release_git_ref = "1.1" class Builder(MesonBuilder): dependencies = ['libzim', 'zlib', 'xapian-core', 'gumbo', 'icu4c', 'libmagic']