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

Merge tag '0.0.37'

This commit is contained in:
Matthieu Gautier 2019-08-22 17:35:23 +02:00
parent 6b3a5657db c2c715802d
commit 78187e9752
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kiwixbuild/versions.py
View File

@ -1,9 +1,9 @@
# 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': '6.0.1', 'kiwix-lib': '6.0.2',
'kiwix-tools': '3.0.1', 'kiwix-tools': '3.0.1',
'libzim': '5.0.2', 'libzim': '5.1.0',
'zim-tools': '1.0.4', 'zim-tools': '1.0.4',
'zimwriterfs': '1.3.5', 'zimwriterfs': '1.3.5',
'kiwix-desktop': '2.0-rc1' # Also need to be change in appveyor/package_kiwix-desktop.sh 'kiwix-desktop': '2.0-rc1' # Also need to be change in appveyor/package_kiwix-desktop.sh
@ -27,8 +27,8 @@ release_versions = {
'libzim': None, # Depends of base deps (was 0) 'libzim': None, # Depends of base deps (was 0)
'kiwix-lib': None, # Depends of libzim (was 0) 'kiwix-lib': None, # 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': None, # Depends of libzim (was 1) 'zim-tools': None, # Depends of libzim (was 2)
'zimwriterfs': None, # Depends of libzim (was 1) 'zimwriterfs': None, # Depends of libzim (was 2)
'kiwix-desktop': None # Depends of kiwix-lib and libzim (was 1) 'kiwix-desktop': None # Depends of kiwix-lib and libzim (was 1)
} }

1
scripts/upload_kiwix_lib_android_to_bintray.py
View File

@ -48,6 +48,7 @@ def upload(version, filepath, artefact):
rcode_family = rcode // 100 rcode_family = rcode // 100
if rcode_family not in (2, 3): if rcode_family not in (2, 3):
print("ERROR: Fail to upload artefact") print("ERROR: Fail to upload artefact")
print(r.text)
return False return False
return True return True

1
travis/deploy.sh
View File

@ -83,6 +83,7 @@ then
fi fi
) )
ls $BINTRAY_ARCHIVES_DIR
BINTRAY_ARCHIVES=$(find $BINTRAY_ARCHIVES_DIR -name "*_bintray_info.json" -type f) BINTRAY_ARCHIVES=$(find $BINTRAY_ARCHIVES_DIR -name "*_bintray_info.json" -type f)
if [[ "x$BINTRAY_ARCHIVES" != "x" ]] if [[ "x$BINTRAY_ARCHIVES" != "x" ]]
then then