From 8bd075f1131353d4ec1b165193e51f21eb5400a0 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 17 Feb 2022 09:41:46 +0000 Subject: [PATCH 1/3] Filter long name releases from version selection --- publish/promptingpublish.groovy | 36 +++++++++++++++++---------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/publish/promptingpublish.groovy b/publish/promptingpublish.groovy index ce6a805..9e4a3ba 100644 --- a/publish/promptingpublish.groovy +++ b/publish/promptingpublish.groovy @@ -55,23 +55,25 @@ pipeline { gh = load("${autobuilder.commonscripts()}/versioncontrol/git.groovy") def allreleases = gh.gettaglist(SOURCEDIR) def releases = new ArrayList() - if (FILTER_REDUNDANT_RELEASES == 'false') { - echo("Showing all releases") - releases = allreleases - } else { - echo("Showing filtered releases") - for (release in allreleases) { - if (!release.toLowerCase().startsWith("superceded") && - !release.toLowerCase().startsWith("superseded") && - !release.toLowerCase().startsWith("erroneous") && - !release.toLowerCase().startsWith("faulty") && - !release.toLowerCase().startsWith("ignore") && - !release.toLowerCase().startsWith("inmainline")) { - echo("Showing release: ${release}") - releases.add(release) - } else { - echo("Not showing release: ${release}") - } + for (release in allreleases) { + def boolean canadd = true + if (FILTER_REDUNDANT_RELEASES && ( + release.toLowerCase().startsWith("superceded") || + release.toLowerCase().startsWith("superseded") || + release.toLowerCase().startsWith("erroneous") || + release.toLowerCase().startsWith("faulty") || + release.toLowerCase().startsWith("ignore") || + release.toLowerCase().startsWith("inmainline"))) { + canadd = false + } + if (FILTER_LONGNAME_RELEASES && release.findAll(/[a-zA-Z_]/) { + canadd = false + } + if (canadd) { + echo("Showing release: ${release}") + releases.add(release) + } else { + echo("Not showing release: ${release}") } } timeout(time: 10, unit: 'MINUTES') { From cad2d4e55ba4884aa94c9d3c53fc3dd1c227b260 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 17 Feb 2022 09:43:43 +0000 Subject: [PATCH 2/3] Filter long name releases from version selection --- publish/promptingpublish.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/publish/promptingpublish.groovy b/publish/promptingpublish.groovy index 9e4a3ba..c61f1fd 100644 --- a/publish/promptingpublish.groovy +++ b/publish/promptingpublish.groovy @@ -66,7 +66,7 @@ pipeline { release.toLowerCase().startsWith("inmainline"))) { canadd = false } - if (FILTER_LONGNAME_RELEASES && release.findAll(/[a-zA-Z_]/) { + if (FILTER_LONGNAME_RELEASES && release.findAll(/[a-zA-Z_]/)) { canadd = false } if (canadd) { From 3981ecea3e26f102f4aa7d0c0c39aea3520040a8 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 17 Feb 2022 10:07:16 +0000 Subject: [PATCH 3/3] Filter long name releases from version selection --- publish/promptingpublish.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/publish/promptingpublish.groovy b/publish/promptingpublish.groovy index c61f1fd..d0f6564 100644 --- a/publish/promptingpublish.groovy +++ b/publish/promptingpublish.groovy @@ -66,7 +66,7 @@ pipeline { release.toLowerCase().startsWith("inmainline"))) { canadd = false } - if (FILTER_LONGNAME_RELEASES && release.findAll(/[a-zA-Z_]/)) { + if (FILTER_LONGNAME_RELEASES && release.findAll(/[a-zA-Z]/)) { canadd = false } if (canadd) {