diff --git a/Jenkinsfile b/Jenkinsfile index 8e2aad7dc57d098835bbe5c988039d5c60ddbb52..df6c7b601c0008a2ea9290fc55b413ebc8edfe72 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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