Fix -dirty suffix of 1.7.10 build on CI
This commit is contained in:
@@ -10,7 +10,7 @@ pipeline:
|
||||
- git config --global user.email "replaymod@drone" && git config --global user.name "Drone"
|
||||
- ./gradlew -PworkAroundBuildOrder=1 --parallel shadowJar :1.8:setCoreVersion
|
||||
- ./gradlew --old-gradle :1.7.10:setupCIWorkspace :jGui:1.7.10:setupCIWorkspace
|
||||
- ./gradlew --old-gradle :1.7.10:shadowJar :shadowJar
|
||||
- ./gradlew --old-gradle -PignoreDirty=1 :1.7.10:shadowJar :shadowJar
|
||||
archive:
|
||||
image: plugins/s3
|
||||
acl: public-read
|
||||
|
||||
@@ -26,7 +26,7 @@ if (releaseCommit == currentCommit) {
|
||||
def diff = command('git', 'log', '--format=oneline', "$releaseCommit..$currentCommit").size()
|
||||
version = "$latestVersion-$diff-g${currentCommit.substring(0, 7)}"
|
||||
}
|
||||
if (gitDescribe().endsWith('*')) {
|
||||
if (gitDescribe().endsWith('*') && !project.hasProperty('ignoreDirty')) {
|
||||
version = "$version-dirty"
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user