From 5a3ccd287f83e0fc924fa2d75825e40ec2051232 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Tue, 19 Mar 2019 17:18:17 +0100 Subject: [PATCH 1/2] Look for the correct SSH_KEY in the docker environment. --- travis/deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis/deploy.sh b/travis/deploy.sh index 89eeba7..543a13f 100755 --- a/travis/deploy.sh +++ b/travis/deploy.sh @@ -8,7 +8,7 @@ RELEASE_KIWIX_ARCHIVES_DIR=${HOME}/RELEASE_KIWIX_ARCHIVES RELEASE_ZIM_ARCHIVES_DIR=${HOME}/RELEASE_ZIM_ARCHIVES DIST_KIWIX_ARCHIVES_DIR=${HOME}/DIST_KIWIX_ARCHIVES DIST_ZIM_ARCHIVES_DIR=${HOME}/DIST_ZIM_ARCHIVES -SSH_KEY=${TRAVISCI_SSH_KEY:-travis/travisci_builder_id_key} +SSH_KEY=${TRAVIS_BUILD_DIR}/travis/travisci_builder_id_key if [[ "$TRAVIS_EVENT_TYPE" = "cron" ]] then From 714eeb3bb9faef60f377a1d9d5a9cef7891f622c Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Tue, 19 Mar 2019 18:01:05 +0100 Subject: [PATCH 2/2] New releases of projects. --- appveyor/package_kiwix-desktop.sh | 2 +- kiwixbuild/versions.py | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/appveyor/package_kiwix-desktop.sh b/appveyor/package_kiwix-desktop.sh index fdc3048..d6da602 100644 --- a/appveyor/package_kiwix-desktop.sh +++ b/appveyor/package_kiwix-desktop.sh @@ -7,7 +7,7 @@ then KIWIX_ARCHIVES_DIR=/c/projects/NIGHTLY_KIWIX_ARCHIVES/${NIGHTLY_DATE} KIWIX_DIR=kiwix-desktop_windows_x64_$NIGHTLY_DATE else - KIWIX_DESKTOP_VERSION=2.0-beta3 + KIWIX_DESKTOP_VERSION=2.0-beta4 KIWIX_ARCHIVES_DIR=/c/projects/RELEASE_KIWIX_ARCHIVES KIWIX_DIR=kiwix-desktop_windows_x64_${KIWIX_DESKTOP_VERSION} fi diff --git a/kiwixbuild/versions.py b/kiwixbuild/versions.py index b62c9ea..3cd6732 100644 --- a/kiwixbuild/versions.py +++ b/kiwixbuild/versions.py @@ -1,12 +1,12 @@ # This file reference all the versions of the depedencies we use in kiwix-build. main_project_versions = { - 'kiwix-lib': '4.0.1', - 'kiwix-tools': '1.0.0', - 'libzim': '4.0.5', + 'kiwix-lib': '4.1.0', + 'kiwix-tools': '1.1.0', + 'libzim': '4.0.6', 'zim-tools': '1.0.0', - 'zimwriterfs': '1.2', - 'kiwix-desktop': '2.0-beta3' # Also need to be change in appveyor/package_kiwix-desktop.sh + 'zimwriterfs': '1.3', + 'kiwix-desktop': '2.0-beta4' # Also need to be change in appveyor/package_kiwix-desktop.sh } # This dictionnary specify what we need to build at each release process. @@ -27,9 +27,9 @@ release_versions = { 'libzim': 0, # Depends of base deps (was 0) 'kiwix-lib': 0, # Depends of libzim (was 0) 'kiwix-tools': 0, # Depends of kiwix-lib and libzim (was 0) - 'zim-tools': 3, # Depends of libzim (was 2) - 'zimwriterfs': 2, # Depends of libzim (was 1) - 'kiwix-desktop': 1 # Depends of kiwix-lib and libzim + 'zim-tools': 4, # Depends of libzim (was 3) + 'zimwriterfs': 0, # Depends of libzim (was 0) + 'kiwix-desktop': 0 # Depends of kiwix-lib and libzim }