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.30'

This commit is contained in:
Matthieu Gautier 2019-08-05 17:29:05 +02:00
parent 2f102c7450 fc22437d84
commit 64886b6a48
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/upload_kiwix_lib_android_to_bintray.py
View File

@ -64,7 +64,7 @@ def create_version(version):
print("Bintray Version created!") print("Bintray Version created!")
return True return True
print("ERROR : Bintray API response {}".format(code)) print("ERROR : Bintray API response {}".format(rcode))
return False return False
@ -87,7 +87,7 @@ def upload_archive(version, filename, artefact):
return False return False
# Upload the pom file # Upload the pom file
pom_artefact = os.path.splitext(artefact) + ".pom" pom_artefact = os.path.splitext(artefact)[0] + ".pom"
url = url_template.format(version=version, artefact=pom_artefact) url = url_template.format(version=version, artefact=pom_artefact)
data = generate_pom_file(version) data = generate_pom_file(version)
r = requests.put(url, data=data, auth=bintray_auth, params=parameters) r = requests.put(url, data=data, auth=bintray_auth, params=parameters)

12
travis/compile_all.py
View File

@ -478,9 +478,9 @@ elif PLATFORM == 'i586_static':
elif make_release and PLATFORM == 'flatpak': elif make_release and PLATFORM == 'flatpak':
update_flathub_git() update_flathub_git()
elif PLATFORM == 'android' and 'kiwix-lib-app' in TARGETS: elif PLATFORM == 'android' and 'kiwix-lib-app' in TARGETS:
if make_release and release_versions.get(project) is not None: if make_release and release_versions.get('kiwix-lib') is not None:
postfix = main_project_versions[project] postfix = main_project_versions['kiwix-lib']
extra_postfix = release_versions.get(project) extra_postfix = release_versions.get('kiwix-lib')
if extra_postfix: if extra_postfix:
postfix = "{}-{}".format(postfix, extra_postfix) postfix = "{}-{}".format(postfix, extra_postfix)
@ -492,9 +492,9 @@ elif PLATFORM == 'android' and 'kiwix-lib-app' in TARGETS:
json_filename = '{}_bintray_info.json'.format(arr_name) json_filename = '{}_bintray_info.json'.format(arr_name)
data = { data = {
version: main_project_versions[project], 'version': postfix,
filename : arr_name, 'filename': arr_name,
artefact: 'kiwixlib-5.1.0.aar' 'artefact': arr_name
} }
with open(str(BINTRAY_ARCHIVES_DIR/json_filename), 'w') as f: with open(str(BINTRAY_ARCHIVES_DIR/json_filename), 'w') as f:
json.dump(data, f) json.dump(data, f)

2
travis/deploy.sh
View File

@ -88,7 +88,7 @@ then
then then
for archive_info in $BINTRAY_ARCHIVES for archive_info in $BINTRAY_ARCHIVES
do do
${HOME}/kiwix-build/scripts/upload_kiwix_lib_android_to_bintray.py $archive_info ${TRAVIS_BUILD_DIR}/scripts/upload_kiwix_lib_android_to_bintray.py $archive_info
done done
fi fi