From cd5296d056e008610237624a34625f96be38d2f5 Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Thu, 1 May 2025 16:15:54 +0200 Subject: [PATCH] Revert "Fix Jenkinsfile to not ust strip but trim" This reverts commit 788ba23c9f17dcdf515c5f08f5d4679b3e0f1904. --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e11010ad978..641ee0e813e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -71,7 +71,7 @@ def getNativeJdkUrl(String os, String arch) { // To update the used JDK version } def getLatestGitTag() { - return sh(script: 'git describe --abbrev=0 --tags --match v[0-9][0-9][0-9][0-9]*', returnStdout: true).trim() + return sh(script: 'git describe --abbrev=0 --tags --match v[0-9][0-9][0-9][0-9]*', returnStdout: true).strip() } def getSWTVersions() { // must be called from the repository root @@ -159,7 +159,7 @@ pipeline { def sources = sourceFoldersProps.collectEntries{ k, src -> [ k, src.split(',').collect{ f -> '\'' + f + '\''}.join(' ') ] } for(ws in allWS) { def diff = sh(script: "git diff HEAD ${swtTag} ${sources.src_common} ${sources['src_' + ws]}", returnStdout: true) - if (!diff.trim().isEmpty()) { + if (!diff.strip().isEmpty()) { NATIVES_CHANGED += ws } }