Merge branch 'master' into swagger-api

hyperledger-labs · Jan 11, 2018 · 93d4307 · 93d4307
2 parents 2c3620d + fd58270
commit 93d4307
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/build.sbt b/build.sbt
@@ -26,7 +26,11 @@ version in ThisBuild := {
   if (git.gitCurrentTags.value.nonEmpty) {
     git.gitDescribedVersion.value.get
   } else {
-    git.gitCurrentBranch.value + "-" + git.gitHeadCommit.value.get.take(8) + "-SNAPSHOT"
+    if (git.gitHeadCommit.value.contains(git.gitCurrentBranch.value)) {
+      git.gitHeadCommit.value.get.take(8) + "-SNAPSHOT"
+    } else {
+      git.gitCurrentBranch.value + "-" + git.gitHeadCommit.value.get.take(8) + "-SNAPSHOT"
+    }
   }
 }