DIvan2000/ReplayModCinematic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix -dirty suffix of 1.7.10 build on CI

Browse Source
This commit is contained in:
Jonas Herzig
2019-05-07 12:49:53 +02:00
parent d54905713f
commit f1527c51fe
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.drone.yml
View File

@@ -10,7 +10,7 @@ pipeline:
- git config --global user.email "replaymod@drone" && git config --global user.name "Drone" - git config --global user.email "replaymod@drone" && git config --global user.name "Drone"
- ./gradlew -PworkAroundBuildOrder=1 --parallel shadowJar :1.8:setCoreVersion - ./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: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: archive:
image: plugins/s3 image: plugins/s3
acl: public-read acl: public-read

2
build.gradle
View File

@@ -26,7 +26,7 @@ if (releaseCommit == currentCommit) {
def diff = command('git', 'log', '--format=oneline', "$releaseCommit..$currentCommit").size() def diff = command('git', 'log', '--format=oneline', "$releaseCommit..$currentCommit").size()
version = "$latestVersion-$diff-g${currentCommit.substring(0, 7)}" version = "$latestVersion-$diff-g${currentCommit.substring(0, 7)}"
} }
if (gitDescribe().endsWith('*')) { if (gitDescribe().endsWith('*') && !project.hasProperty('ignoreDirty')) {
version = "$version-dirty" version = "$version-dirty"
} }