Skip to content
Snippets Groups Projects
Commit 37adbf3f authored by Sébastien Blin's avatar Sébastien Blin
Browse files

nightly

Change-Id: Ib0bb0985a396a9284229c79acc113a25c79c97bd
parent bde70f07
No related branches found
No related tags found
No related merge requests found
......@@ -136,8 +136,14 @@ See https://wiki.savoirfairelinux.com/wiki/Jenkins.jami.net#Configuration_client
steps {
sh """git checkout ${params.CHANNEL}
git status
git reset --hard origin/nightly
git status
# Submodules are generally not managed by merging
git merge -X theirs --no-commit FETCH_HEAD || git add `git diff --name-status --diff-filter=U | awk '{print \$2}'`
git merge -X theirs --no-commit FETCH_HEAD || true
git status
git checkout FETCH_HEAD -- daemon lrc client-qt client-gnome lrc-gnome
git status
"""
}
}
......
client-gnome @ 2be304c9
Subproject commit d493e44ff3fd106456df85d0e73f6b3c08ecd38c
Subproject commit 2be304c9245d1be5762da292068dd591a336250c
client-qt @ 92829ad3
Subproject commit 83f68573324a453a6d26e025fd6439f175a79d1b
Subproject commit 92829ad3e14dc85cf20d1125ad9fda80887c8290
daemon @ dca2eaaa
Subproject commit 02c5cecd363a1ee25a914d72e243d7903e44969b
Subproject commit dca2eaaa4bb672e3e7c2f69ad02c88c0af15c9a2
lrc @ 492ff0fe
Subproject commit 48db64cbcd3a8d7a12cad940694ce9239b8db576
Subproject commit 492ff0fec3f9f880a923faaae9ca112e560109c9
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment