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

test

Change-Id: I32e75bdef93a386425fed12ef3b5e1f0d681cbbc
parent 7fb3236a
No related branches found
No related tags found
No related merge requests found
......@@ -137,10 +137,10 @@ 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 reset --hard origin/${params.CHANNEL}
git status
# Submodules are generally not managed by merging
git merge -X theirs --no-commit FETCH_HEAD || true
git merge -X theirs --no-commit FETCH_HEAD
git status
git checkout FETCH_HEAD -- daemon lrc client-qt
git status
......
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