From ccb67db3759a16e95a75920d87281185310ccd81 Mon Sep 17 00:00:00 2001 From: Robby Date: Sat, 7 Apr 2018 08:23:42 -0500 Subject: Merge April 1 - 4, 2018 changes on master (#283) * fix build * Detect sh/batch launcher, dev.assembly, and release filename. * Updated appveyor cache. * Added some entries for master in readme.md changelog. * Updated readme.md changelog. * fixes #173; use default(compile) configuration for deps as default (#270) * revert #254 to fix bootstrapping https://github.com/lihaoyi/mill/issues/268 * 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 * revive #254 and fix #268 (#274) * Test mill batch (.bat) in AppVeyor * fix minor typos in docs * Sync Ammonite in ScalaModule (with build.sc). --- ci/test-mill-dev.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'ci/test-mill-dev.sh') 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 -- cgit v1.2.3