smallsolar
/
kiwix-build
mirror of https://github.com/kiwix/kiwix-build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #304 from kiwix/new_release 

New release
This commit is contained in:
Matthieu Gautier 2019-03-19 18:48:51 +01:00 committed by GitHub
parent 0a768a2aac 714eeb3bb9
commit 250c20ced6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
appveyor/package_kiwix-desktop.sh
View File

@ -7,7 +7,7 @@ then
KIWIX_ARCHIVES_DIR=/c/projects/NIGHTLY_KIWIX_ARCHIVES/${NIGHTLY_DATE} KIWIX_ARCHIVES_DIR=/c/projects/NIGHTLY_KIWIX_ARCHIVES/${NIGHTLY_DATE}
KIWIX_DIR=kiwix-desktop_windows_x64_$NIGHTLY_DATE KIWIX_DIR=kiwix-desktop_windows_x64_$NIGHTLY_DATE
else else
KIWIX_DESKTOP_VERSION=2.0-beta3 KIWIX_DESKTOP_VERSION=2.0-beta4
KIWIX_ARCHIVES_DIR=/c/projects/RELEASE_KIWIX_ARCHIVES KIWIX_ARCHIVES_DIR=/c/projects/RELEASE_KIWIX_ARCHIVES
KIWIX_DIR=kiwix-desktop_windows_x64_${KIWIX_DESKTOP_VERSION} KIWIX_DIR=kiwix-desktop_windows_x64_${KIWIX_DESKTOP_VERSION}
fi fi

16
kiwixbuild/versions.py
View File

@ -1,12 +1,12 @@
# This file reference all the versions of the depedencies we use in kiwix-build. # This file reference all the versions of the depedencies we use in kiwix-build.
main_project_versions = { main_project_versions = {
'kiwix-lib': '4.0.1', 'kiwix-lib': '4.1.0',
'kiwix-tools': '1.0.0', 'kiwix-tools': '1.1.0',
'libzim': '4.0.5', 'libzim': '4.0.6',
'zim-tools': '1.0.0', 'zim-tools': '1.0.0',
'zimwriterfs': '1.2', 'zimwriterfs': '1.3',
'kiwix-desktop': '2.0-beta3' # Also need to be change in appveyor/package_kiwix-desktop.sh '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. # 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) 'libzim': 0, # Depends of base deps (was 0)
'kiwix-lib': 0, # Depends of libzim (was 0) 'kiwix-lib': 0, # Depends of libzim (was 0)
'kiwix-tools': 0, # Depends of kiwix-lib and libzim (was 0) 'kiwix-tools': 0, # Depends of kiwix-lib and libzim (was 0)
'zim-tools': 3, # Depends of libzim (was 2) 'zim-tools': 4, # Depends of libzim (was 3)
'zimwriterfs': 2, # Depends of libzim (was 1) 'zimwriterfs': 0, # Depends of libzim (was 0)
'kiwix-desktop': 1 # Depends of kiwix-lib and libzim 'kiwix-desktop': 0 # Depends of kiwix-lib and libzim
} }

2
travis/deploy.sh
View File

@ -8,7 +8,7 @@ RELEASE_KIWIX_ARCHIVES_DIR=${HOME}/RELEASE_KIWIX_ARCHIVES
RELEASE_ZIM_ARCHIVES_DIR=${HOME}/RELEASE_ZIM_ARCHIVES RELEASE_ZIM_ARCHIVES_DIR=${HOME}/RELEASE_ZIM_ARCHIVES
DIST_KIWIX_ARCHIVES_DIR=${HOME}/DIST_KIWIX_ARCHIVES DIST_KIWIX_ARCHIVES_DIR=${HOME}/DIST_KIWIX_ARCHIVES
DIST_ZIM_ARCHIVES_DIR=${HOME}/DIST_ZIM_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" ]] if [[ "$TRAVIS_EVENT_TYPE" = "cron" ]]
then then