From 63882e5229babf53a95fdf286789b7a8a3d8448a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
 <sebastien.blin@savoirfairelinux.com>
Date: Thu, 17 Mar 2022 15:47:33 -0400
Subject: [PATCH] nightly

Change-Id: Ib0bb0985a396a9284229c79acc113a25c79c97bd
---
 Jenkinsfile  | 8 +++++++-
 client-gnome | 2 +-
 client-qt    | 2 +-
 daemon       | 2 +-
 lrc          | 2 +-
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index ce870dbb..5e91cb4e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -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
                    """
             }
         }
diff --git a/client-gnome b/client-gnome
index d493e44f..2be304c9 160000
--- a/client-gnome
+++ b/client-gnome
@@ -1 +1 @@
-Subproject commit d493e44ff3fd106456df85d0e73f6b3c08ecd38c
+Subproject commit 2be304c9245d1be5762da292068dd591a336250c
diff --git a/client-qt b/client-qt
index 83f68573..bef42fb1 160000
--- a/client-qt
+++ b/client-qt
@@ -1 +1 @@
-Subproject commit 83f68573324a453a6d26e025fd6439f175a79d1b
+Subproject commit bef42fb1ce9b4cbd1418bae539d0ac8f75e8a590
diff --git a/daemon b/daemon
index 02c5cecd..0c98f2b1 160000
--- a/daemon
+++ b/daemon
@@ -1 +1 @@
-Subproject commit 02c5cecd363a1ee25a914d72e243d7903e44969b
+Subproject commit 0c98f2b1ffd8528ec26a0d4abc67a6de3067263a
diff --git a/lrc b/lrc
index 48db64cb..0c88ebaf 160000
--- a/lrc
+++ b/lrc
@@ -1 +1 @@
-Subproject commit 48db64cbcd3a8d7a12cad940694ce9239b8db576
+Subproject commit 0c88ebafe0f640afd74c215533f9315f171e0d8d
-- 
GitLab