From 2f5cbb7ebfe62d334912191925849f2a39e94518 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Tue, 12 Feb 2019 11:34:58 +0100
Subject: [PATCH] [Jenkins] Fix Qt uic shared lib errors during compilation.
---
Jenkinsfile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 773273db917..55092c2f197 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -145,7 +145,8 @@ pipeline {
dockerfile {
filename 'Dockerfile.gcc.gui'
dir 'scripts/docker'
- label 'docker'
+ // Singularity1 has on old kernel (3.10) which is not compatible with Qt > 5.10 (req. 3.15)
+ label 'docker && !singularity1'
args '-v /home/jenkins/cache/ccache:/opt/ccache -v /home/jenkins/cache/conan/.conan:/opt/conan/.conan'
additionalBuildArgs '--pull'
}
--
GitLab