Skip to content

Commit 50aab34

Browse files
committed
build: handle maintenance branches correctly
1 parent 2396d4c commit 50aab34

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

build.gradle

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,16 @@ def minor = '2'
7474
def major = '2018'
7575

7676
if (ciBuild) {
77-
version = GitBasedVersioning.getVersionWithCount(major, minor, System.env.BUILD_NUMBER.toInteger())
77+
String branch = GitBasedVersioning.gitBranch
78+
79+
def buildNumber = System.env.BUILD_NUMBER.toInteger()
80+
if (branch.startsWith("maintenance")) {
81+
version = "$major.$minor.$buildNumber.${GitBasedVersioning.gitShortCommitHash}"
82+
//version = GitBasedVersioning.getVersion("" ,major, minor, buildNumber)
83+
} else {
84+
version = GitBasedVersioning.getVersionWithCount(major, minor, buildNumber)
85+
}
86+
7887
println "##teamcity[buildNumber '${version}']"
7988
} else {
8089
println "Local build detected, version will be SNAPSHOT"

0 commit comments

Comments
 (0)