From 4b8868f0da64043b91dd1f9308e2ccd47bba51c3 Mon Sep 17 00:00:00 2001 From: Jason Frame Date: Wed, 8 Feb 2023 16:23:26 +1000 Subject: [PATCH 1/2] Fix manifest docker not skipping interim builds for RCs Signed-off-by: Jason Frame --- build.gradle | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index ae516109e8b..a1145207587 100644 --- a/build.gradle +++ b/build.gradle @@ -778,7 +778,10 @@ task manifestDocker { tags.add("${dockerImageName}:develop") } - if (!(dockerBuildVersion ==~ /.*-SNAPSHOT/)) { + def isInterimBuild = (dockerBuildVersion ==~ /.*-SNAPSHOT/) || (dockerBuildVersion ==~ /.*-alpha/) + || (dockerBuildVersion ==~ /.*-beta/) || (dockerBuildVersion ==~ /.*-RC.*/) + + if (!isInterimBuild) { tags.add("${dockerImageName}:" + dockerBuildVersion.split(/\./)[0..1].join('.')) } From 50c188cd6e2c9b9716243a09a1871a18ad60c789 Mon Sep 17 00:00:00 2001 From: Jason Frame Date: Thu, 9 Feb 2023 11:54:48 +1000 Subject: [PATCH 2/2] Create function for isInterimBuild logic Signed-off-by: Jason Frame --- build.gradle | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index a1145207587..713d7ab4b9c 100644 --- a/build.gradle +++ b/build.gradle @@ -715,10 +715,7 @@ task dockerUpload { additionalTags.add('develop') } - def isInterimBuild = (dockerBuildVersion ==~ /.*-SNAPSHOT/) || (dockerBuildVersion ==~ /.*-alpha/) - || (dockerBuildVersion ==~ /.*-beta/) || (dockerBuildVersion ==~ /.*-RC.*/) - - if (!isInterimBuild) { + if (!isInterimBuild(dockerBuildVersion)) { additionalTags.add(dockerBuildVersion.split(/\./)[0..1].join('.')) } @@ -778,10 +775,7 @@ task manifestDocker { tags.add("${dockerImageName}:develop") } - def isInterimBuild = (dockerBuildVersion ==~ /.*-SNAPSHOT/) || (dockerBuildVersion ==~ /.*-alpha/) - || (dockerBuildVersion ==~ /.*-beta/) || (dockerBuildVersion ==~ /.*-RC.*/) - - if (!isInterimBuild) { + if (!isInterimBuild(dockerBuildVersion)) { tags.add("${dockerImageName}:" + dockerBuildVersion.split(/\./)[0..1].join('.')) } @@ -932,6 +926,12 @@ def getCheckedOutGitCommitHash(length = 8) { } } +// Takes the version and if it contains SNAPSHOT, alpha, beta or RC in version then return true indicating an interim build +def isInterimBuild(dockerBuildVersion) { + return (dockerBuildVersion ==~ /.*-SNAPSHOT/) || (dockerBuildVersion ==~ /.*-alpha/) + || (dockerBuildVersion ==~ /.*-beta/) || (dockerBuildVersion ==~ /.*-RC.*/) +} + tasks.register("verifyDistributions") { dependsOn distTar dependsOn distZip