all T.commands to take targets as CLI arguments, and use that to get rid of our custom releaseCI/releaseManual commands

3 files changed, 23 insertions, 20 deletions

diff --git a/ci/release.py b/ci/release.py
new file mode 100755
index 00000000..c59c6811
--- /dev/null
+++ b/ci/release.py
@@ -0,0 +1,22 @@
+#!/usr/bin/env python
+
+from subprocess import check_call
+import os, base64
+check_call(["sbt", "bin/test:assembly"])
+is_master_commit = (
+    os.environ["TRAVIS_PULL_REQUEST"] == "false" &&
+    (os.environ["TRAVIS_BRANCH"] == "master" || os.environ["TRAVIS_TAG"] != "")
+)
+
+with open("~/gpg.key", "w") as f:
+    f.write(base64.b64decode(os.environ["GPG_PRIVATE_KEY_B64"]))
+
+check_call(["gpg", "--import", "~/gpg.key"])
+
+check_call([
+    "target/bin/mill",
+    "mill.scalalib.PublishModule/publishAll",
+    "lihaoyi:" + os.environ["SONATYPE_PASSWORD"],
+    os.environ["GPG_PASSWORD"],
+    "_.publishArtifacts"
+])
diff --git a/ci/release.sh b/ci/release.sh
deleted file mode 100755
index e9ff8302..00000000
--- a/ci/release.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-set -eux
-
-sbt bin/test:assembly
-
-target/bin/mill releaseCI \
-    $GITHUB_ACCESS_TOKEN \
-    lihaoyi:$SONATYPE_PASSWORD \
-    $GPG_PASSWORD \
-    $GPG_PRIVATE_KEY_B64
diff --git a/ci/test-mill-release.sh b/ci/test-mill-release.sh
index 52fc053d..5e19bcdc 100755
--- a/ci/test-mill-release.sh
+++ b/ci/test-mill-release.sh
@@ -9,15 +9,7 @@ git clean -xdf
 sbt bin/test:assembly
 
 # Build Mill using SBT
-target/bin/mill --all \
-    moduledefs.publishLocal \
-    core.publishLocal \
-    scalalib.publishLocal \
-    scalaworker.publishLocal \
-    scalajslib.publishLocal \
-    scalajslib.jsbridges[0.6].publishLocal \
-    scalajslib.jsbridges[1.0].publishLocal \
-    releaseAssembly
+target/bin/mill --all _.publishLocal releaseAssembly
 
 mv out/releaseAssembly/dest/out.jar ~/mill-release