From 05be522ef49dfe3a0df305388313b411fce52aa3 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Thu, 22 Aug 2019 14:32:18 +0200 Subject: [PATCH 1/2] Print response content in case we cannot upload artifact to bintray. --- scripts/upload_kiwix_lib_android_to_bintray.py | 1 + travis/deploy.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/scripts/upload_kiwix_lib_android_to_bintray.py b/scripts/upload_kiwix_lib_android_to_bintray.py index d8f20ff..cb61e43 100755 --- a/scripts/upload_kiwix_lib_android_to_bintray.py +++ b/scripts/upload_kiwix_lib_android_to_bintray.py @@ -48,6 +48,7 @@ def upload(version, filepath, artefact): rcode_family = rcode // 100 if rcode_family not in (2, 3): print("ERROR: Fail to upload artefact") + print(r.text) return False return True diff --git a/travis/deploy.sh b/travis/deploy.sh index 3c890d5..4592c22 100755 --- a/travis/deploy.sh +++ b/travis/deploy.sh @@ -83,6 +83,7 @@ then fi ) + ls $BINTRAY_ARCHIVES_DIR BINTRAY_ARCHIVES=$(find $BINTRAY_ARCHIVES_DIR -name "*_bintray_info.json" -type f) if [[ "x$BINTRAY_ARCHIVES" != "x" ]] then From c2c715802d1727143f5bcb7b9c5c9e8c318ce656 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Thu, 22 Aug 2019 16:07:38 +0200 Subject: [PATCH 2/2] New version of libzim and kiwix-lib. --- kiwixbuild/versions.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/kiwixbuild/versions.py b/kiwixbuild/versions.py index 1d8bf03..07c91b0 100644 --- a/kiwixbuild/versions.py +++ b/kiwixbuild/versions.py @@ -1,9 +1,9 @@ # This file reference all the versions of the depedencies we use in kiwix-build. main_project_versions = { - 'kiwix-lib': '6.0.1', + 'kiwix-lib': '6.0.2', 'kiwix-tools': '3.0.0', - 'libzim': '5.0.2', + 'libzim': '5.1.0', 'zim-tools': '1.0.4', 'zimwriterfs': '1.3.5', 'kiwix-desktop': '2.0-rc1' # Also need to be change in appveyor/package_kiwix-desktop.sh @@ -24,11 +24,11 @@ main_project_versions = { # - Else, increment the value. If no value was present, see `(was ...)`. release_versions = { - 'libzim': None, # Depends of base deps (was 0) + 'libzim': 0, # Depends of base deps (was 0) 'kiwix-lib': 0, # Depends of libzim (was 0) 'kiwix-tools': None, # Depends of kiwix-lib and libzim (was 0) - 'zim-tools': None, # Depends of libzim (was 1) - 'zimwriterfs': None, # Depends of libzim (was 1) + 'zim-tools': 2, # Depends of libzim (was 1) + 'zimwriterfs': 2, # Depends of libzim (was 1) 'kiwix-desktop': None # Depends of kiwix-lib and libzim (was 1) }