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') {