diff --git a/.drone.yml b/.drone.yml index e830aea2..228115d1 100644 --- a/.drone.yml +++ b/.drone.yml @@ -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 diff --git a/build.gradle b/build.gradle index 983be598..94a7d4b7 100755 --- a/build.gradle +++ b/build.gradle @@ -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" }