From 93ad1bea33bd4304e831232dca66af2ee683b69a Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 17 Dec 2021 11:50:07 +0000 Subject: [PATCH] Make the walkers carry more meta data --- meta/folder.groovy | 8 ++++---- release/do.groovy | 6 +++--- release/release.groovy | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index 0fd0d8e..1c6441b 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -1039,7 +1039,7 @@ class MetaInfo extends GISJsonSerialised { } Map releasewalkerversionunique(int maxdepth, String startpath = '', String startmetapath = '') { - def ArrayList metacollection = releasewalker(maxdepth, "${startpath}/${METAFOLDERNAME}", startmetapath) + def ArrayList metacollection = releasewalker(maxdepth, startpath, "${startmetapath}/${METAFOLDERNAME}") def Map versionuniquecollection = new LinkedHashMap() for (metaitem in metacollection) { @@ -1050,10 +1050,10 @@ class MetaInfo extends GISJsonSerialised { return versionuniquecollection } - Map releasewalkerunique(int maxdepth, String startpath = '') { - def ArrayList metacollection = releasewalker(maxdepth, "${startpath}/${METAFOLDERNAME}") + Map releasewalkerunique(int maxdepth, String startpath = '', String startmetapath = '') { + def ArrayList metacollection = releasewalker(maxdepth, startpath, "${startmetapath}/${METAFOLDERNAME}") - def Map uniquecollection = new LinkedHashMap() + def Map uniquecollection = new LinkedHashMap() for (metaitem in metacollection) { def String uniquestring = metaitem.metainfo.componentidentifier() uniquecollection.put(uniquestring, metaitem) diff --git a/release/do.groovy b/release/do.groovy index d131173..133d425 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -396,13 +396,13 @@ def releasecomponent(toplevelbuildmeta, buildinfo, String otherreleasetags, Stri repoandtagsappend("\n") } -def releasehierarchy(buildfolder, buildmeta, String maxdepth, String otherreleasetags, String dryrunpush) { +def releasehierarchy(String buildfolder, String metafolder, buildmeta, String maxdepth, String otherreleasetags, String dryrunpush) { def int md = maxdepth.toInteger() resetfolders() preconditions() // Walk the meta information to a max depth, looking for components to release - def componentReleaseInfo = buildmeta.releasewalkerunique(md, buildfolder) + def componentReleaseInfo = buildmeta.releasewalkerunique(md, buildfolder, metafolder) echo "Unique components:" def String versioncomponent = "" for (key in componentReleaseInfo.keySet()) { @@ -411,7 +411,7 @@ def releasehierarchy(buildfolder, buildmeta, String maxdepth, String otherreleas echo versioncomponent // Walk the meta information to a max depth, looking for components to release - def componentReleaseInfoVersionUnique = buildmeta.releasewalkerversionunique(md, buildfolder) + def componentReleaseInfoVersionUnique = buildmeta.releasewalkerversionunique(md, buildfolder metafolder) echo "Version unique components:" def String versionuniquecomponent = "" for (key in componentReleaseInfoVersionUnique.keySet()) { diff --git a/release/release.groovy b/release/release.groovy index 2324b60..82af511 100644 --- a/release/release.groovy +++ b/release/release.groovy @@ -42,7 +42,7 @@ pipeline { def releaser = load("${autobuilder.commonscripts()}/release/do.groovy") // Place the top level build stamp on all OTHER_RELEASE_TAGS = "${buildmeta.globalreleasetag()},${OTHER_RELEASE_TAGS}" - (summarystring, markunstable, unstablereason) = releaser.releasehierarchy(BUILD_ARTIFACTS, buildmeta, MAX_META_DEPTH, OTHER_RELEASE_TAGS, DRY_RUN_PUSH) + (summarystring, markunstable, unstablereason) = releaser.releasehierarchy('', BUILD_ARTIFACTS, buildmeta, MAX_META_DEPTH, OTHER_RELEASE_TAGS, DRY_RUN_PUSH) if (markunstable) { env.unstablereason = unstablereason currentBuild.result = 'UNSTABLE'