diff options
Diffstat (limited to 'build.sc')
-rwxr-xr-x | build.sc | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -206,17 +206,21 @@ val isMasterCommit = { (sys.env.get("TRAVIS_BRANCH") == Some("master") || sys.env("TRAVIS_TAG") != "") } +def gitHead = T.input{ + sys.env.get("TRAVIS_COMMIT").getOrElse( + %%('git, "rev-parse", "head")(pwd).out.string.trim() + ) +} def publishVersion = T.input{ val tag = - try Option(%%('git, 'describe, "--exact-match", "--tags", 'HEAD)(pwd).out.string) + try Option(%%('git, 'describe, "--exact-match", "--tags", gitHead())(pwd).out.string) catch{case e => None} tag match{ case Some(t) => (t, t) case None => val timestamp = java.time.Instant.now().toString.replaceAll(":|\\.", "-") - val gitHash = %%('git, "rev-parse", "head")(pwd).out.string.trim() - ("unstable", timestamp + "-" + gitHash) + ("unstable", timestamp + "-" + gitHead()) } } |