Update offset to match CI

This commit is contained in:
NotMyFault 2019-01-03 12:52:23 +01:00 committed by GitHub
parent 2b8afaf930
commit 1f39257753
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -30,6 +30,8 @@ clean { delete "target" }
print new File('splash.txt').text print new File('splash.txt').text
group = 'com.boydti.fawe' group = 'com.boydti.fawe'
def rootVersion = "1.13"
def revision = "" def revision = ""
def buildNumber = "" def buildNumber = ""
def date = "" def date = ""
@ -38,13 +40,13 @@ ext {
git = org.ajoberstar.grgit.Grgit.open(file(".git")) git = org.ajoberstar.grgit.Grgit.open(file(".git"))
date = git.head().date.format("yy.MM.dd") date = git.head().date.format("yy.MM.dd")
revision = "-${git.head().abbreviatedId}" revision = "-${git.head().abbreviatedId}"
index = 0; // Offset to match CI index = -1959; // Offset to match CI
parents = git.head().parentIds; parents = git.head().parentIds;
for (; parents != null && !parents.isEmpty(); index++) { for (; parents != null && !parents.isEmpty(); index++) {
commit = git.getResolve().toCommit(parents.get(0)); commit = git.getResolve().toCommit(parents.get(0));
parents = commit.getParentIds() parents = commit.getParentIds()
} }
buildNumber = "-${index}" buildNumber = "${index}"
} catch (Throwable ignore) { } catch (Throwable ignore) {
revision = "-unknown" revision = "-unknown"
} }
@ -53,7 +55,7 @@ ext {
if ( project.hasProperty("lzNoVersion") ) { // gradle build -PlzNoVersion if ( project.hasProperty("lzNoVersion") ) { // gradle build -PlzNoVersion
version = "unknown" version = "unknown"
} else { } else {
version = date + revision + buildNumber version = String.format("%s.%s", rootVersion, buildNumber)
} }
description = """FastAsyncWorldEdit""" description = """FastAsyncWorldEdit"""