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 #335 from kiwix/fix_git 

Fix git
This commit is contained in:
Matthieu Gautier 2019-06-12 15:24:58 +02:00 committed by GitHub
parent c76f2e7c51 e0eb5c4a38
commit a85296d38b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kiwixbuild/versions.py
View File

@ -28,7 +28,7 @@ release_versions = {
'kiwix-lib': None, # Depends of libzim (was 0)
'kiwix-tools': None, # Depends of kiwix-lib and libzim (was 0)
'zim-tools': None, # Depends of libzim (was 0)
'zimwriterfs': 0, # Depends of libzim (was 0)
'zimwriterfs': None, # Depends of libzim (was 0)
'kiwix-desktop': 0 # Depends of kiwix-lib and libzim (was 0)
}

5
travis/compile_all.py
View File

@ -54,6 +54,7 @@ EXPORT_FILES = {
'include/zim/**/*.h'))
}
FLATPAK_HTTP_GIT_REMOTE = 'https://github.com/flathub/org.kiwix.desktop.git'
FLATPAK_GIT_REMOTE = 'git@github.com:flathub/org.kiwix.desktop.git'
_date = date.today().isoformat()
@ -254,7 +255,7 @@ def update_flathub_git():
def call(command, cwd=None):
cwd = cwd or GIT_REPO_DIR
subprocess.check_call(command, env=env, cwd=str(cwd))
command = ['git', 'clone', FLATPAK_GIT_REMOTE]
command = ['git', 'clone', FLATPAK_HTTP_GIT_REMOTE]
call(command, cwd=GIT_EXPORT_DIR)
shutil.copy(str(BASE_DIR/'org.kiwix.desktop.json'), str(GIT_REPO_DIR))
patch_dir = KBUILD_SOURCE_DIR/'kiwixbuild'/'patches'
@ -266,6 +267,8 @@ def update_flathub_git():
command = ['git', 'commit', '-m',
'Update to version {}'.format(main_project_versions['kiwix-desktop'])]
call(command)
command = ['git', 'config', 'remote.origin.pushurl', FLATPAK_GIT_REMOTE]
call(command)