From f9e2359888cfa2acec7097a4ccbbba3574e788a9 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 8 Sep 2018 16:14:04 +0100 Subject: [PATCH 1/7] Cause a project build retry if the final binary was not produced --- compile/eclipsebuild/eclipseds5build.gsh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/compile/eclipsebuild/eclipseds5build.gsh b/compile/eclipsebuild/eclipseds5build.gsh index 38cbb40..0ff36da 100644 --- a/compile/eclipsebuild/eclipseds5build.gsh +++ b/compile/eclipsebuild/eclipseds5build.gsh @@ -19,10 +19,16 @@ def doExport(exportfolder, exportpathlist, build_variant = "") { dir (env.destFolder) { echo "Copy \"${srcFileExpanded}\" to \"${destFolder}\"" if (isUnix()) { - sh "cp -r -v \"${srcFileExpanded}\" \"${destFolder}\"" + sh """ + cp -r -v "${srcFileExpanded}" "${destFolder}" + if [ \$? -ne 0 ]; then exit 1; fi + """ } else { - bat 'copy \"%srcFileExpanded%\" \"%destFolder%\"' + bat ''' + copy \"%srcFileExpanded%\" \"%destFolder%\" + if errorlevel 1 exit /b 1 + ''' } } } From d77a2dbcc8c215680d71470606981a69b46068f2 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 8 Sep 2018 16:58:30 +0100 Subject: [PATCH 2/7] Look out for HMB tickets when comparing revision differences --- differences/show_release_differences.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/differences/show_release_differences.py b/differences/show_release_differences.py index a778892..93d540b 100644 --- a/differences/show_release_differences.py +++ b/differences/show_release_differences.py @@ -72,6 +72,12 @@ jiraprojectpattern = { 'IMB': ( re.compile("^.* +(?:[Ii][Mm][Bb][ _-]*|\#\s*)(\d+):*(.*)$"), re.compile('^(\S*) Revert " *IMB-(\d+):* (.*)"$'), ), + 'HMBXR5601': ( re.compile("^.* +(?:[Hh][Mm][Bb][Xx][Rr]5601[ _-]*|\#\s*)(\d+):*(.*)$"), + re.compile('^(\S*) Revert " *HMBXR5601-(\d+):* (.*)"$'), + ), + 'SMB': ( re.compile("^.* +(?:[Ss][Mm][Bb][ _-]*|\#\s*)(\d+):*(.*)$"), + re.compile('^(\S*) Revert " *SMB-(\d+):* (.*)"$'), + ), } mergepattern = re.compile("^(.*)((?:Merge branch '.*'|Merge remote-tracking branch '.*'|Merge commit '.*'|Add '.*' from commit).*)$") From 4022e1d35a5c867041ab077d94e2fbf4ab0850aa Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 8 Sep 2018 18:48:54 +0100 Subject: [PATCH 3/7] Disable parallel builds; Retry build if copy fails --- .../eclipsebuild/disableparallelbuilds.gsh | 12 ++++++++++ compile/eclipsebuild/eclipseds5build.gsh | 24 +++++++++++++------ 2 files changed, 29 insertions(+), 7 deletions(-) create mode 100644 compile/eclipsebuild/disableparallelbuilds.gsh diff --git a/compile/eclipsebuild/disableparallelbuilds.gsh b/compile/eclipsebuild/disableparallelbuilds.gsh new file mode 100644 index 0000000..77f5eb5 --- /dev/null +++ b/compile/eclipsebuild/disableparallelbuilds.gsh @@ -0,0 +1,12 @@ + +// Disable parallel make builds - which may be causing autobuild issues +def doDisableParallelMake(rootSearchFolder = "${WORKSPACE}") { + if (isUnix()) { + sh """ + # Looks for " Date: Sat, 8 Sep 2018 18:53:43 +0100 Subject: [PATCH 4/7] Disable parallel builds; Retry build if copy fails --- compile/eclipsebuild/disableparallelbuilds.gsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compile/eclipsebuild/disableparallelbuilds.gsh b/compile/eclipsebuild/disableparallelbuilds.gsh index 77f5eb5..aeca69a 100644 --- a/compile/eclipsebuild/disableparallelbuilds.gsh +++ b/compile/eclipsebuild/disableparallelbuilds.gsh @@ -4,7 +4,7 @@ def doDisableParallelMake(rootSearchFolder = "${WORKSPACE}") { if (isUnix()) { sh """ # Looks for " Date: Sat, 8 Sep 2018 18:57:09 +0100 Subject: [PATCH 5/7] Disable parallel builds; Retry build if copy fails --- compile/eclipsebuild/disableparallelbuilds.gsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compile/eclipsebuild/disableparallelbuilds.gsh b/compile/eclipsebuild/disableparallelbuilds.gsh index aeca69a..c4322cd 100644 --- a/compile/eclipsebuild/disableparallelbuilds.gsh +++ b/compile/eclipsebuild/disableparallelbuilds.gsh @@ -4,7 +4,7 @@ def doDisableParallelMake(rootSearchFolder = "${WORKSPACE}") { if (isUnix()) { sh """ # Looks for " Date: Sat, 8 Sep 2018 18:59:30 +0100 Subject: [PATCH 6/7] Disable parallel builds; Retry build if copy fails --- compile/eclipsebuild/disableparallelbuilds.gsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compile/eclipsebuild/disableparallelbuilds.gsh b/compile/eclipsebuild/disableparallelbuilds.gsh index c4322cd..03e4c8f 100644 --- a/compile/eclipsebuild/disableparallelbuilds.gsh +++ b/compile/eclipsebuild/disableparallelbuilds.gsh @@ -4,7 +4,7 @@ def doDisableParallelMake(rootSearchFolder = "${WORKSPACE}") { if (isUnix()) { sh """ # Looks for " Date: Sat, 8 Sep 2018 19:53:12 +0100 Subject: [PATCH 7/7] Put all compiled binaries in one variant specific folder on the target - making it easier to find all shared objects --- compile/eclipsebuild/eclipseds5build.gsh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/compile/eclipsebuild/eclipseds5build.gsh b/compile/eclipsebuild/eclipseds5build.gsh index 5d8c5a3..9f702fe 100644 --- a/compile/eclipsebuild/eclipseds5build.gsh +++ b/compile/eclipsebuild/eclipseds5build.gsh @@ -1,5 +1,5 @@ -def doExport(exportfolder, exportpathlist, build_variant = "") { +def doExport(exportfolder, exportpathlist, project = "", build_variant = "") { def result = 0 for (exportpath in exportpathlist) { echo "Export path at: ${exportpath}" @@ -7,7 +7,7 @@ def doExport(exportfolder, exportpathlist, build_variant = "") { echo "Build variant is ${build_variant}" if (build_variant) { echo "Build variant is ${build_variant}" - env.destFolder = "${exportfolder}/${build_variant}/${project}" + env.destFolder = "${exportfolder}/${build_variant}" env.srcFile = "${WORKSPACE}/${exportpath}" env.srcFileExpanded = srcFile.replace("-BUILDVARIANT-", "${build_variant}") } @@ -68,14 +68,14 @@ def doBuild(apps, exportfolder = "${WORKSPACE}/bin") { "%DS5SHELL%" "%BUILD_COMMAND%" ${buildtype} "${project}\\${build_variant}" """ } - doExport(exportfolder, exportpathlist, build_variant) + doExport(exportfolder, exportpathlist, "", build_variant) } } } else { // Only export if the project has no variants - signifying that there are files to export which have been prebuilt if (!variants) { - doExport(exportfolder, exportpathlist) + doExport(exportfolder, exportpathlist, project) } } }