Skip to content
Snippets Groups Projects
Unverified Commit 63882e52 authored by Sébastien Blin's avatar Sébastien Blin Committed by Amin Bandali
Browse files

nightly

Change-Id: Ib0bb0985a396a9284229c79acc113a25c79c97bd
parent 915439a5
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 @ bef42fb1
Subproject commit 83f68573324a453a6d26e025fd6439f175a79d1b
Subproject commit bef42fb1ce9b4cbd1418bae539d0ac8f75e8a590
daemon @ 0c98f2b1
Subproject commit 02c5cecd363a1ee25a914d72e243d7903e44969b
Subproject commit 0c98f2b1ffd8528ec26a0d4abc67a6de3067263a
lrc @ 0c88ebaf
Subproject commit 48db64cbcd3a8d7a12cad940694ce9239b8db576
Subproject commit 0c88ebafe0f640afd74c215533f9315f171e0d8d
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment