From 3649d77024bf60e59d5cc9acfca1dae8583736bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Thu, 7 Apr 2022 19:30:39 -0400
Subject: [PATCH] jenkinsfile: reset correct channel
Change-Id: I32e75bdef93a386425fed12ef3b5e1f0d681cbbc
---
Jenkinsfile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 8e2aad7d..df6c7b60 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
--
GitLab