From 30c9a1b571f258fdd340fea94aba3f4ba8b48896 Mon Sep 17 00:00:00 2001 From: Manuele Simi Date: Sun, 7 Jun 2020 11:02:41 -0400 Subject: [PATCH] Fix changelog reader. --- Jenkinsfile.groovy | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile.groovy b/Jenkinsfile.groovy index 050757e..3aee226 100644 --- a/Jenkinsfile.groovy +++ b/Jenkinsfile.groovy @@ -155,7 +155,7 @@ String get_last_commit(repo_name) { String get_changelog(repo_name) { String text; dir(repo_name) { - msg = sh(script: 'cat CHANGELOG.md || echo NA', returnStdout: true)?.trim() + text = sh(script: 'cat CHANGELOG.md || echo NA', returnStdout: true)?.trim() } return text; } @@ -170,12 +170,15 @@ String get_changelog(repo_name) { * @return the notes for then current release */ String extract(log_content, tag, gCube_release_version, component) { - - def matcher = "${log_content}" =~ /(?im)\[v${tag}\]\s\[r${gCube_release_version}\](.*)\[v.*\]\s\[r.*\]/ + println "Changelong content: ${log_content}" + def matcher = "${log_content}" =~ /(?im)\([v${tag}\]\s\[r${gCube_release_version}\].*)\[v.*\]\s\[r.*\]/ if (!matcher.find()) { return 'NA' } assert matcher[0]: "Missing release notes for ${component}" + for (g in matcher) { + println "Group: $g" + } return matcher[0] }