Handle the case where rebuilt binaries change even though the original source has not changed and the version number has not changed - Tags now have the build number appended to them so that there is no tag clash during the release process

This commit is contained in:
Dan Hawkins 2019-01-25 15:32:00 +00:00
commit 4fd07d22d6

View file

@ -270,7 +270,7 @@ def sourcegitpush(String dryrunpush ) {
def gitrelease(buildmeta, previousreleasemeta, String releaserepo, String sourcerepo, String otherreleasetags, String dryrunpush) { def gitrelease(buildmeta, previousreleasemeta, String releaserepo, String sourcerepo, String otherreleasetags, String dryrunpush) {
summaryappend(" Git operations: ") summaryappend(" Git operations: ")
def String buildstamp = buildmeta.buildstampinfo.buildstamp def String buildstamp = "${buildmeta.buildstampinfo.buildstamp}_${buildmeta.jenkinsbuildinfo.buildnumber}"
dir(releaserepo) { dir(releaserepo) {
def String precommitshacode = sh(script: "git rev-parse --verify HEAD", returnStdout: true).trim() def String precommitshacode = sh(script: "git rev-parse --verify HEAD", returnStdout: true).trim()
@ -298,7 +298,7 @@ def gitrelease(buildmeta, previousreleasemeta, String releaserepo, String source
} }
} }
dir(sourcerepo) { dir(sourcerepo) {
def String srcbuildstamp = "${buildmeta.productinfo.productname}_${buildmeta.productinfo.subcomponentname}_${buildmeta.buildstampinfo.buildstamp}" def String srcbuildstamp = "${buildmeta.productinfo.productname}_${buildmeta.productinfo.subcomponentname}_${buildstamp}"
def String buildsha = buildmeta.gitinfo.gitrevision def String buildsha = buildmeta.gitinfo.gitrevision
if (buildsha) { if (buildsha) {