diff --git a/meta/folder.groovy b/meta/folder.groovy index 5c71003..5d630a9 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -603,6 +603,12 @@ class MetaInfo extends GISJsonSerialised { def deserialiseJson(String filepath) { script.echo("Deserialising JSON at file: ${filepath}") + File jsonfile = new File(filepath) + def jsonfiletext = jsonfile.getText() + + echo "File contents: ${jsonfiletext}" + + def rawmeta = script.readJSON(file: filepath) deserialiseJson(rawmeta) } diff --git a/release/do.groovy b/release/do.groovy index e538512..c4a389a 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -422,12 +422,13 @@ def releasehierarchy(buildmeta, String maxdepth, String otherreleasetags, String if (componentReleaseInfo.size() != componentReleaseInfoVersionUnique.size()) { error "There are 2 or more versions of the same component being used in this hierarchy: Is this correct? (If you ignore this issue, you will get an error much later because the system cannot tag 2 different commits of the associated source code with the same label)" } - for (key in componentReleaseInfo.keySet()) { - def buildinfo = componentReleaseInfo[key] - echo "${key}: ${buildinfo.jenkinsbuildinfo.builddate} ${buildinfo.jenkinsbuildinfo.isfullbuild} ${buildinfo.jenkinsbuildinfo} ${buildinfo.jenkinsbuildinfo.isFullBuild()}" - if (!buildinfo.jenkinsbuildinfo.isFullBuild()) { - error "The subcomponent: ${buildinfo.componentidentifier()} is not a full build (Some artifacts are missing)" - } + } + + for (key in componentReleaseInfo.keySet()) { + def buildinfo = componentReleaseInfo[key] + echo "${key}: ${buildinfo.jenkinsbuildinfo.builddate} ${buildinfo.jenkinsbuildinfo.isfullbuild} ${buildinfo.jenkinsbuildinfo.isFullBuild()}" + if (!buildinfo.jenkinsbuildinfo.isFullBuild()) { + error "The subcomponent: ${buildinfo.componentidentifier()} is not a full build (Some artifacts are missing)" } }