Merge 1.16 into 1.18
This commit is contained in:
commit
f1e2b21d8f
|
|
@ -41,7 +41,7 @@ allprojects {
|
||||||
}
|
}
|
||||||
def baseVersion = details.lastTag.substring(0, plusIndex)
|
def baseVersion = details.lastTag.substring(0, plusIndex)
|
||||||
def dirtyMarker = grgit.status().clean ? "" : ".dirty"
|
def dirtyMarker = grgit.status().clean ? "" : ".dirty"
|
||||||
def commitHashMarker = details.commitDistance > 0 ? ("." + details.gitHash) : ""
|
def commitHashMarker = details.commitDistance > 0 ? ("." + details.gitHash.substring(0, Math.min(4, details.gitHash.length()))) : ""
|
||||||
def preMarker = (details.commitDistance > 0 || !details.isCleanTag) ? ("-beta." + details.commitDistance) : ""
|
def preMarker = (details.commitDistance > 0 || !details.isCleanTag) ? ("-beta." + details.commitDistance) : ""
|
||||||
if(preMarker.length() > 0) {
|
if(preMarker.length() > 0) {
|
||||||
// bump to next patch release
|
// bump to next patch release
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user