From 997758daa014e597e7bdd96b1e39a654a99f54ca Mon Sep 17 00:00:00 2001
From: Jens Georg <jens.georg@desy.de>
Date: Thu, 22 Apr 2021 12:26:13 +0200
Subject: [PATCH] cppcheck: Move into right step
---
vars/helper.groovy | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/vars/helper.groovy b/vars/helper.groovy
index ddb0de3..137482b 100644
--- a/vars/helper.groovy
+++ b/vars/helper.groovy
@@ -65,6 +65,12 @@ def doBuildTestDeploy(ArrayList<String> dependencyList, String label, String bui
// tests for asan and tsan are run in the analysis jobs
doTest(label, buildType)
}
+
+ // Run cppcheck only for focal-debug
+ if((!env.DISABLE_CPPCHECK || env.DISABLE_CPPCHECK == '') && buildType == "Debug") {
+ doCppcheck(label, buildType)
+ }
+
doInstall(label, buildType)
}
@@ -77,9 +83,6 @@ def doAnalysis(String label, String buildType) {
doPrepare(false)
doBuilddirArtefact(label, buildType)
- // Run cppcheck only for focal-debug
- doCppcheck(label, buildType)
-
// Add inactivity timeout of 60 minutes (build will be interrupted if 60 minutes no log output has been produced)
timeout(activity: true, time: 60) {
--
GitLab