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

Fix git clone 

Clone using https (without ssh key) in the docker.
Push using git (with ssh key) in the travis host.
This commit is contained in:
Matthieu Gautier 2019-06-12 13:51:01 +02:00
parent c76f2e7c51
commit 388ac6fdb9
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
travis/compile_all.py
View File

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