From 2ca0e93973264a1e9e46ebd080b0887308847eb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Tue, 25 Jan 2022 13:56:06 -0500
Subject: [PATCH] jenkinsfile: update from master branch
Change-Id: I2e5736d4304bb841c8ec86d883b7bc0641669881
---
Jenkinsfile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 3cbbd6e7..888bb7a9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -136,7 +136,8 @@ See https://wiki.savoirfairelinux.com/wiki/Jenkins.jami.net#Configuration_client
steps {
sh """git checkout ${params.CHANNEL}
- git merge --no-commit FETCH_HEAD
+ # 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}'`
"""
}
}
--
GitLab