Rebootstrap mill, split CI release process into two separate jobs (#748)

* rebootstrap mill, split CI release process into two separate jobs * docs
com-lihaoyi · Dec 20, 2019 · 3b88d50 · 3b88d50
1 parent fd66664
commit 3b88d50
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -41,7 +41,10 @@ matrix:
 
 
   - stage: release
-    env: CI_SCRIPT="ci/on-master.py ci/release.sh"
+    env: CI_SCRIPT="ci/on-master.py ci/release-github.sh"
+    jdk: oraclejdk9
+  - stage: release
+    env: CI_SCRIPT="ci/on-master.py ci/release-maven.sh"
     jdk: oraclejdk9
   - stage: release
     env: CI_SCRIPT="ci/on-master.py ci/publish-docs.sh"

diff --git a/ci/release-github.sh b/ci/release-github.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+set -eux
+
+# Build Mill
+./mill -i dev.assembly
+
+rm -rf ~/.mill
+
+out/dev/assembly/dest/mill uploadToGithub $GITHUB_ACCESS_TOKEN
diff --git a/ci/release.sh → ci/release-maven.sh b/ci/release.sh → ci/release-maven.sh
@@ -13,8 +13,6 @@ rm gpg_key
 
 rm -rf ~/.mill
 
-out/dev/assembly/dest/mill uploadToGithub $GITHUB_ACCESS_TOKEN
-
 out/dev/assembly/dest/mill mill.scalalib.PublishModule/publishAll \
     --sonatypeCreds lihaoyi:$SONATYPE_PASSWORD \
     --gpgPassphrase $GPG_PASSWORD \

diff --git a/docs/pages/1 - Intro to Mill.md b/docs/pages/1 - Intro to Mill.md
@@ -44,8 +44,8 @@ pkg install mill
 ### Windows
 
 To get started, download Mill from:
-https://github.com/lihaoyi/mill/releases/download/0.5.5/0.5.5-assembly, and save it as
-`mill.bat`.
+https://github.com/lihaoyi/mill/releases/download/0.5.6/0.5.6-assembly, and save
+it as `mill.bat`.
 
 If you're using [Scoop](https://scoop.sh) you can install Mill via
 
@@ -81,7 +81,7 @@ To get started, download Mill and install it into your system via the following
 `curl`/`chmod` command:
 
 ```bash
-sudo curl -L https://github.com/lihaoyi/mill/releases/download/0.5.5/0.5.5 > /usr/local/bin/mill && sudo chmod +x /usr/local/bin/mill
+sudo curl -L https://github.com/lihaoyi/mill/releases/download/0.5.6/0.5.6 > /usr/local/bin/mill && sudo chmod +x /usr/local/bin/mill
 ```
 
 ### Bootstrap Scripts (Linux/OS-X Only)
@@ -90,7 +90,7 @@ If you are using Mill in a codebase, you can commit the bootstrap launcher as a
 `./mill` script in the project folder:
 
 ```bash
-curl -L https://github.com/lihaoyi/mill/releases/download/0.5.5/0.5.5 > mill && chmod +x mill
+curl -L https://github.com/lihaoyi/mill/releases/download/0.5.6/0.5.6 > mill && chmod +x mill
 ```
 
 Now, anyone who wants to work with the project can simply use the `./mill`

diff --git a/mill b/mill
@@ -3,7 +3,7 @@
 # This is a wrapper script, that automatically download mill from GitHub release pages
 # You can give the required mill version with MILL_VERSION env variable
 # If no version is given, it falls back to the value of DEFAULT_MILL_VERSION
-DEFAULT_MILL_VERSION=0.5.2
+DEFAULT_MILL_VERSION=0.5.6
 
 set -e