From 5df106084edd8217bf9fa473072868a9d1ecfb5f Mon Sep 17 00:00:00 2001
From: Li Haoyi <haoyi.sg@gmail.com>
Date: Sun, 4 Feb 2018 21:30:19 -0800
Subject: wip getting release.sh working

---
 .travis.yml   | 16 ++++++++--------
 build.sc      | 34 +++++++++++++++++-----------------
 ci/release.sh |  2 +-
 3 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index da939589..a00810fb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,14 +10,14 @@ jdk:
 
 matrix:
   include:
-  - stage: build
-    env: CI_SCRIPT=ci/test-sbt.sh
-  - stage: build
-    env: CI_SCRIPT=ci/test-sbt-built.sh
-  - stage: build
-    env: CI_SCRIPT=ci/test-mill-built.sh
-  - stage: build
-    env: CI_SCRIPT=ci/test-mill-release.sh
+#  - stage: build
+#    env: CI_SCRIPT=ci/test-sbt.sh
+#  - stage: build
+#    env: CI_SCRIPT=ci/test-sbt-built.sh
+#  - stage: build
+#    env: CI_SCRIPT=ci/test-mill-built.sh
+#  - stage: build
+#    env: CI_SCRIPT=ci/test-mill-release.sh
   - stage: release
     env: CI_SCRIPT=ci/release.sh
 
diff --git a/build.sc b/build.sc
index ff819daf..0201f076 100755
--- a/build.sc
+++ b/build.sc
@@ -213,7 +213,9 @@ def gitHead = T.input{
 }
 def publishVersion = T.input{
   val tag =
-    try Option(%%('git, 'describe, "--exact-match", "--tags", gitHead())(pwd).out.string)
+    try Option(
+      %%('git, 'describe, "--exact-match", "--tags", gitHead())(pwd).out.string.trim()
+    )
     catch{case e => None}
 
   tag match{
@@ -247,10 +249,10 @@ def releaseCI(githubAuthKey: String,
               sonatypeCreds: String,
               gpgPassphrase: String,
               gpgPrivateKey: String) =
-  if (isMasterCommit) T.command()
+  if (!isMasterCommit) T.command()
   else {
     write(home / "gpg.key", java.util.Base64.getDecoder.decode(gpgPrivateKey))
-    %('gpg, 'import, home / "gpg.key")(pwd)
+    %('gpg, "--import", home / "gpg.key")(pwd)
     T.command{
       releaseManual(githubAuthKey, sonatypeCreds, gpgPassphrase)()
     }
@@ -259,18 +261,16 @@ def releaseCI(githubAuthKey: String,
 
 def releaseManual(githubAuthKey: String,
                   sonatypeCreds: String,
-                  gpgPassphrase: String) =
-  if (isMasterCommit) T.command()
-  else T.command{
-    moduledefs.publish(sonatypeCreds, gpgPassphrase)()
-    core.publish(sonatypeCreds, gpgPassphrase)()
-    scalalib.publish(sonatypeCreds, gpgPassphrase)()
-    scalajslib.publish(sonatypeCreds, gpgPassphrase)()
-    scalaworker.publish(sonatypeCreds, gpgPassphrase)()
-    scalajslib.jsbridges("0.6").publish(sonatypeCreds, gpgPassphrase)()
-    scalajslib.jsbridges("1.0").publish(sonatypeCreds, gpgPassphrase)()
-    val (release, label) = publishVersion()
-    uploadToGithub(releaseAssembly().path, githubAuthKey, release, label)
-    ()
-  }
+                  gpgPassphrase: String) = T.command{
+  moduledefs.publish(sonatypeCreds, gpgPassphrase)()
+  core.publish(sonatypeCreds, gpgPassphrase)()
+  scalalib.publish(sonatypeCreds, gpgPassphrase)()
+  scalajslib.publish(sonatypeCreds, gpgPassphrase)()
+  scalaworker.publish(sonatypeCreds, gpgPassphrase)()
+  scalajslib.jsbridges("0.6").publish(sonatypeCreds, gpgPassphrase)()
+  scalajslib.jsbridges("1.0").publish(sonatypeCreds, gpgPassphrase)()
+  val (release, label) = publishVersion()
+  uploadToGithub(releaseAssembly().path, githubAuthKey, release, label)
+  ()
+}
 
diff --git a/ci/release.sh b/ci/release.sh
index 18bfc399..e9ff8302 100755
--- a/ci/release.sh
+++ b/ci/release.sh
@@ -2,7 +2,7 @@
 
 set -eux
 
-
+sbt bin/test:assembly
 
 target/bin/mill releaseCI \
     $GITHUB_ACCESS_TOKEN \
-- 
cgit v1.2.3