mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2024-11-26 07:06:44 +01:00
Merge branch 'breaking' of https://github.com/IntellectualSites/PlotSquared into breaking
This commit is contained in:
commit
0c0d0104d7
@ -32,11 +32,15 @@ ext {
|
|||||||
date = git.head().getDate().format("yy.MM.dd")
|
date = git.head().getDate().format("yy.MM.dd")
|
||||||
revision = "-${git.head().abbreviatedId}"
|
revision = "-${git.head().abbreviatedId}"
|
||||||
parents = git.head().parentIds;
|
parents = git.head().parentIds;
|
||||||
index = -2039; // Offset to match CI
|
if (project.hasProperty('buildnumber')) {
|
||||||
|
buildNumber = "$buildnumber"
|
||||||
|
} else {
|
||||||
|
index = -2042; // Offset to match CI
|
||||||
for (; parents != null && !parents.isEmpty(); index++) {
|
for (; parents != null && !parents.isEmpty(); index++) {
|
||||||
parents = git.getResolve().toCommit(parents.get(0)).getParentIds()
|
parents = git.getResolve().toCommit(parents.get(0)).getParentIds()
|
||||||
}
|
}
|
||||||
buildNumber = "${index}"
|
buildNumber = "${index}"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// version = String.format("%s.%s%s%s", rootVersion, date, revision, buildNumber)
|
// version = String.format("%s.%s%s%s", rootVersion, date, revision, buildNumber)
|
||||||
|
Loading…
Reference in New Issue
Block a user