From 397227a2819e315c88e773f26f174d9e1bfa535c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Tue, 5 Jul 2022 11:48:18 -0400
Subject: [PATCH] nightly
Change-Id: I6ce71d7ecf2e97dbdc0a47be65249caff40028ba
---
Jenkinsfile | 3 ++-
client-qt | 2 +-
daemon | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 3766bfa1..976a891a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -139,7 +139,8 @@ See https://wiki.savoirfairelinux.com/wiki/Jenkins.jami.net#Configuration_client
git reset --hard origin/${params.CHANNEL}
# Submodules are generally not managed by merging
git status
- git merge -X theirs --no-commit FETCH_HEAD
+ rm -rf client-gnome lrc-gnome
+ git merge -X theirs --no-commit FETCH_HEAD || git status && git add `git diff --name-status --diff-filter=U | awk '{print \$2}'`
"""
}
}
diff --git a/client-qt b/client-qt
index 1a14fd27..300ac17d 160000
--- a/client-qt
+++ b/client-qt
@@ -1 +1 @@
-Subproject commit 1a14fd27fe6d99ae130604daaf1cc0d99aec1040
+Subproject commit 300ac17db3372cd7e9c52cc77eafca0c63bcbbe2
diff --git a/daemon b/daemon
index 72a7d233..3e832042 160000
--- a/daemon
+++ b/daemon
@@ -1 +1 @@
-Subproject commit 72a7d2339a1ba9bb1cf356f19c28deeb2f9be76e
+Subproject commit 3e83204248340d2548051bdbf087b451b9dad9dd
--
GitLab