diff --git a/meta/folder.groovy b/meta/folder.groovy index 39de31f..ff56928 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -658,12 +658,16 @@ class MetaInfo extends GISJsonSerialised { return releasemetacollection } + String componentidentifier() { + return productinfo.productname + "_" + productinfo.subcomponentname + } + Map releasewalkerunique(int maxdepth, String startpath = "") { Map releasemetauniquecollection = new LinkedHashMap() ArrayList releasemetacollection = new ArrayList() releasemetacollection = releasewalkerp(maxdepth, releasemetacollection, startpath) for (relatedmetainfo in releasemetacollection) { - String uniquestring = relatedmetainfo.meta.productinfo.productname + "_" + relatedmetainfo.meta.productinfo.subcomponentname + String uniquestring = relatedmetainfo.meta.componentidentifier() releasemetauniquecollection.put(uniquestring, relatedmetainfo) } return releasemetauniquecollection diff --git a/release/do.groovy b/release/do.groovy index 0ea3399..e264cc0 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -341,11 +341,18 @@ def releasehierarchy(buildmeta, String maxdepth, String otherreleasetags, String // Walk the meta information to a max depth, looking for artifacts to import for release componentReleaseInfo = buildmeta.releasewalkerunique(md) + def toplevelid = buildmeta.componentidentifier() // For each component for (key in componentReleaseInfo.keySet()) { def buildinfo = componentReleaseInfo[key] - releasecomponent(buildinfo, otherreleasetags, dryrunpush) + if (toplevelid != key) { + releasecomponent(buildinfo, otherreleasetags, dryrunpush) + } } + // Do the top level last + def toplevelbuildinfo = componentReleaseInfo[toplevelid] + releasecomponent(toplevelbuildinfo, otherreleasetags, dryrunpush) + return [summarystring, markunstable, unstablereason] }