From b9c3aae64ee741c4f90de74800eaee30ff0aef0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Mon, 11 Apr 2022 14:39:30 -0400
Subject: [PATCH] jenkinsfile: ignoer submodules errors
Change-Id: Id3e23e3273f95d522ad6b6af4314a76c508682d1
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index df6c7b60..97bfdaa0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -140,7 +140,7 @@ See https://wiki.savoirfairelinux.com/wiki/Jenkins.jami.net#Configuration_client
git reset --hard origin/${params.CHANNEL}
git status
# Submodules are generally not managed by merging
- git merge -X theirs --no-commit FETCH_HEAD
+ git merge -X theirs --no-commit FETCH_HEAD || true
git status
git checkout FETCH_HEAD -- daemon lrc client-qt
git status
--
GitLab