diff options
author | Li Haoyi <haoyi.sg@gmail.com> | 2018-02-04 15:07:27 -0800 |
---|---|---|
committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-02-04 15:07:27 -0800 |
commit | 789adf42a4ca0d9a354f9709b10db4029bf9de16 (patch) | |
tree | fa21a36d0658af10ffb81903ef194326e949f79f | |
parent | 7022254ac1b156a466baa45afea1bb723bd59929 (diff) | |
download | mill-789adf42a4ca0d9a354f9709b10db4029bf9de16.tar.gz mill-789adf42a4ca0d9a354f9709b10db4029bf9de16.tar.bz2 mill-789adf42a4ca0d9a354f9709b10db4029bf9de16.zip |
fix artifact naming for publishLocal/publish
-rwxr-xr-x | build.sc | 11 | ||||
-rw-r--r-- | scalajslib/src/mill/scalajslib/ScalaJSModule.scala | 2 |
2 files changed, 5 insertions, 8 deletions
@@ -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) } } diff --git a/scalajslib/src/mill/scalajslib/ScalaJSModule.scala b/scalajslib/src/mill/scalajslib/ScalaJSModule.scala index 70ae1394..462fef5a 100644 --- a/scalajslib/src/mill/scalajslib/ScalaJSModule.scala +++ b/scalajslib/src/mill/scalajslib/ScalaJSModule.scala @@ -43,7 +43,7 @@ trait ScalaJSModule extends scalalib.ScalaModule { outer => "2.12.4", Seq(Dep( "com.lihaoyi", - s"mill-jsbridge_${scalaJSBridgeVersion().replace('.', '_')}", + s"mill-scalajslib-jsbridge_${scalaJSBridgeVersion().replace('.', '_')}", sys.props("MILL_VERSION") )) ).map(_.find(_.path.toString.contains("mill-jsbridge")).get) |