summaryrefslogtreecommitdiff
path: root/build.sc
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2018-02-04 11:44:29 -0800
committerLi Haoyi <haoyi.sg@gmail.com>2018-02-04 13:29:30 -0800
commitf47697c1da18407374cf11372af36c4960d80576 (patch)
tree14dd0fe05a01eacd9b1ee8f655e7173410446aed /build.sc
parent2536dc8c071c7c0fc41a0bd806d91ecad300f27c (diff)
downloadmill-f47697c1da18407374cf11372af36c4960d80576.tar.gz
mill-f47697c1da18407374cf11372af36c4960d80576.tar.bz2
mill-f47697c1da18407374cf11372af36c4960d80576.zip
Fix tests
Diffstat (limited to 'build.sc')
-rwxr-xr-xbuild.sc10
1 files changed, 7 insertions, 3 deletions
diff --git a/build.sc b/build.sc
index 97b9afb8..3bcd0b44 100755
--- a/build.sc
+++ b/build.sc
@@ -205,17 +205,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())
}
}