Updated ci tests.

* Reverted Ammonite caching workaround (a796f0a) now that it's fixed

* Changed ci/test-mill-0.sh to use interactive mode due to intermittent client failures to connect to server in travis

* Added ci/test-mill-bootstrap.sh (ci/test-mill-0.sh with bootstrapping) and use it on oraclejdk9 instead of ci/test-mill-0.sh

* Upgraded mill used for ci to 0.1.7-29-f5097f

6 files changed, 34 insertions, 11 deletions

diff --git a/ci/test-mill-0.sh b/ci/test-mill-0.sh
index 3d1470f1..2cc78d81 100755
--- a/ci/test-mill-0.sh
+++ b/ci/test-mill-0.sh
@@ -5,5 +5,5 @@ set -eux
 # Starting from scratch...
 git clean -xdf
 
-# Run tests using Mill built using SBT
-mill all {clientserver,main,scalalib,scalajslib}.test
+# Run tests
+mill -i all {clientserver,main,scalalib,scalajslib}.test
diff --git a/ci/test-mill-1.sh b/ci/test-mill-1.sh
index 079cb519..b0ed7bc2 100755
--- a/ci/test-mill-1.sh
+++ b/ci/test-mill-1.sh
@@ -5,5 +5,5 @@ set -eux
 # Starting from scratch...
 git clean -xdf
 
-# Run tests using Mill built using SBT
+# Run tests
 mill integration.test "mill.integration.local.{JawnTests,BetterFilesTests,UpickleTests}"
diff --git a/ci/test-mill-2.sh b/ci/test-mill-2.sh
index 3b0da706..ce61bb7c 100755
--- a/ci/test-mill-2.sh
+++ b/ci/test-mill-2.sh
@@ -5,5 +5,5 @@ set -eux
 # Starting from scratch...
 git clean -xdf
 
-# Run tests using Mill built using SBT
+# Run tests
 mill integration.test "mill.integration.local.{AcyclicTests,AmmoniteTests}"
diff --git a/ci/test-mill-bootstrap.sh b/ci/test-mill-bootstrap.sh
new file mode 100755
index 00000000..be2b5c3a
--- /dev/null
+++ b/ci/test-mill-bootstrap.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+set -eux
+
+# Starting from scratch...
+git clean -xdf
+
+# First build
+mill -i all __.publishLocal release
+mv out/release/dest/mill ~/mill-1
+
+# Clean up
+git clean -xdf
+
+# Differentiate first and second builds
+echo "Build 2" > info.txt && git add info.txt && git commit -m "Add info.txt"
+
+# Second build
+~/mill-1 -i all __.publishLocal release
+mv out/release/dest/mill ~/mill-2
+
+# Clean up
+git clean -xdf
+
+# Use second build to run tests using Mill
+~/mill-2 -i all {clientserver,main,scalalib,scalajslib}.test
\ No newline at end of file
diff --git a/ci/test-mill-dev.sh b/ci/test-mill-dev.sh
index ae8556fb..52deb139 100755
--- a/ci/test-mill-dev.sh
+++ b/ci/test-mill-dev.sh
@@ -8,8 +8,6 @@ git clean -xdf
 # Build Mill
 mill -i dev.assembly
 
-rm -fR ~/.mill
-
-# Second build & run tests using Mill
+# Second build & run tests
 out/dev/assembly/dest/mill -i all {clientserver,main,scalalib,scalajslib}.test
 
diff --git a/ci/test-mill-release.sh b/ci/test-mill-release.sh
index 19173827..f1fb10ae 100755
--- a/ci/test-mill-release.sh
+++ b/ci/test-mill-release.sh
@@ -5,12 +5,11 @@ set -eux
 # Starting from scratch...
 git clean -xdf
 
+# Build Mill
 ci/publish-local.sh
 
+# Clean up
 git clean -xdf
 
-rm -fR ~/.mill
-
-# Second build & run tests using Mill
-
+# Run tests
 ~/mill-release -i integration.test "mill.integration.forked.{AcyclicTests,UpickleTests,PlayJsonTests}"