Merge 1.16 into 1.18

This commit is contained in:
embeddedt 2023-08-03 12:21:01 -04:00
commit f1e2b21d8f
No known key found for this signature in database
GPG Key ID: A69433EC199B5613

View File

@ -41,7 +41,7 @@ allprojects {
}
def baseVersion = details.lastTag.substring(0, plusIndex)
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) : ""
if(preMarker.length() > 0) {
// bump to next patch release