Skip to content
Snippets Groups Projects
Unverified Commit 677d6b77 authored by Sébastien Blin's avatar Sébastien Blin
Browse files

build.py: remove lrc

Change-Id: I351d4c964967340277891b7e541e37615304f80c
parent 0da25838
No related branches found
No related tags found
No related merge requests found
...@@ -139,8 +139,7 @@ See https://wiki.savoirfairelinux.com/wiki/Jenkins.jami.net#Configuration_client ...@@ -139,8 +139,7 @@ See https://wiki.savoirfairelinux.com/wiki/Jenkins.jami.net#Configuration_client
git reset --hard origin/${params.CHANNEL} git reset --hard origin/${params.CHANNEL}
# Submodules are generally not managed by merging # Submodules are generally not managed by merging
git status git status
rm -rf client-gnome lrc-gnome git merge -X theirs --no-commit FETCH_HEAD
git merge -X theirs --no-commit FETCH_HEAD || git status && git add `git diff --name-status --diff-filter=U | awk '{print \$2}'`
""" """
} }
} }
......
...@@ -395,7 +395,7 @@ def run_init(): ...@@ -395,7 +395,7 @@ def run_init():
for name in module_names: for name in module_names:
copy_file("./scripts/commit-msg", ".git/modules/"+name+"/hooks") copy_file("./scripts/commit-msg", ".git/modules/"+name+"/hooks")
module_names_to_format = ['daemon', 'lrc', 'client-qt', 'plugins'] module_names_to_format = ['daemon', 'client-qt', 'plugins']
for name in module_names_to_format: for name in module_names_to_format:
execute_script( execute_script(
['./scripts/format.sh --install %(path)s'], ['./scripts/format.sh --install %(path)s'],
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment