summaryrefslogtreecommitdiff
path: root/build.sc
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2018-02-04 15:07:27 -0800
committerLi Haoyi <haoyi.sg@gmail.com>2018-02-04 15:07:27 -0800
commit789adf42a4ca0d9a354f9709b10db4029bf9de16 (patch)
treefa21a36d0658af10ffb81903ef194326e949f79f /build.sc
parent7022254ac1b156a466baa45afea1bb723bd59929 (diff)
downloadmill-789adf42a4ca0d9a354f9709b10db4029bf9de16.tar.gz
mill-789adf42a4ca0d9a354f9709b10db4029bf9de16.tar.bz2
mill-789adf42a4ca0d9a354f9709b10db4029bf9de16.zip
fix artifact naming for publishLocal/publish
Diffstat (limited to 'build.sc')
-rwxr-xr-xbuild.sc11
1 files changed, 4 insertions, 7 deletions
diff --git a/build.sc b/build.sc
index 3bcd0b44..1e85b64f 100755
--- a/build.sc
+++ b/build.sc
@@ -10,6 +10,7 @@ import mill.modules.Jvm.createAssembly
import upickle.Js
trait MillPublishModule extends PublishModule{
def scalaVersion = "2.12.4"
+ def artifactName = "mill-" + super.artifactName()
def publishVersion = build.publishVersion()._2
def pomSettings = PomSettings(
@@ -205,21 +206,17 @@ 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", gitHead())(pwd).out.string)
+ try Option(%%('git, 'describe, "--exact-match", "--tags", 'HEAD)(pwd).out.string)
catch{case e => None}
tag match{
case Some(t) => (t, t)
case None =>
val timestamp = java.time.Instant.now().toString.replaceAll(":|\\.", "-")
- ("unstable", timestamp + "-" + gitHead())
+ val gitHash = %%('git, "rev-parse", "head")(pwd).out.string.trim()
+ ("unstable", timestamp + "-" + gitHash)
}
}