diff options
| author | Li Haoyi <haoyi.sg@gmail.com> | 2018-02-21 21:05:37 -0800 |
|---|---|---|
| committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-02-24 17:13:03 -0800 |
| commit | c98408adf2d96928fe227a740631a8efd8e0c339 (patch) | |
| tree | 5a36d9ee7d8ee6e1f7f9247cd7ddd31b194df5df /ci | |
| parent | 51db54d4f1deefb34b9d7f6581611ae166652493 (diff) | |
| download | mill-c98408adf2d96928fe227a740631a8efd8e0c339.tar.gz mill-c98408adf2d96928fe227a740631a8efd8e0c339.tar.bz2 mill-c98408adf2d96928fe227a740631a8efd8e0c339.zip | |
Clean up the provisional client-server code with unit tests and proper file-sockets
Seems to work well enough for interactive scala consoles, though still not Ammonite
Also Added ScalaModule#launcher and re-worked our build.sc file to use it
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/publish-local.sh | 4 | ||||
| -rwxr-xr-x | ci/test-mill-built.sh | 8 | ||||
| -rwxr-xr-x | ci/test-mill-release.sh | 4 | ||||
| -rwxr-xr-x | ci/test-sbt-built.sh | 4 | ||||
| -rwxr-xr-x | ci/test-sbt.sh | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/ci/publish-local.sh b/ci/publish-local.sh index a26a590d..0d7559e3 100755 --- a/ci/publish-local.sh +++ b/ci/publish-local.sh @@ -6,6 +6,6 @@ set -eux sbt bin/test:assembly # Build Mill using SBT -target/bin/mill all __.publishLocal releaseAssembly +target/bin/mill all __.publishLocal release -mv out/releaseAssembly/dest/out.jar ~/mill-release +mv out/release/dest/out.jar ~/mill-release diff --git a/ci/test-mill-built.sh b/ci/test-mill-built.sh index c63e9804..44af3876 100755 --- a/ci/test-mill-built.sh +++ b/ci/test-mill-built.sh @@ -8,10 +8,10 @@ git clean -xdf ci/publish-local.sh # Build Mill using SBT -target/bin/mill devAssembly +target/bin/mill dev.assembly # Second build & run tests using Mill -out/devAssembly/dest/out.jar all {main,scalalib,scalajslib}.test devAssembly -out/devAssembly/dest/out.jar integration.test "mill.integration.forked.{AmmoniteTests,BetterFilesTests}" -out/devAssembly/dest/out.jar devAssembly +out/dev/assembly/dest/out.jar all {clientserver,main,scalalib,scalajslib}.test +out/dev/assembly/dest/out.jar integration.test "mill.integration.forked.{AmmoniteTests,BetterFilesTests}" +out/dev/assembly/dest/out.jar dev.assembly diff --git a/ci/test-mill-release.sh b/ci/test-mill-release.sh index 0b874d48..838d1960 100755 --- a/ci/test-mill-release.sh +++ b/ci/test-mill-release.sh @@ -11,6 +11,6 @@ git clean -xdf # Second build & run tests using Mill -~/mill-release all {main,scalalib,scalajslib}.test +~/mill-release all {clientserver,main,scalalib,scalajslib}.test ~/mill-release integration.test "mill.integration.forked.{AcyclicTests,JawnTests,UpickleTests}" -~/mill-release devAssembly +~/mill-release dev.assembly diff --git a/ci/test-sbt-built.sh b/ci/test-sbt-built.sh index e93eb4fc..3a85d345 100755 --- a/ci/test-sbt-built.sh +++ b/ci/test-sbt-built.sh @@ -8,6 +8,6 @@ git clean -xdf sbt bin/test:assembly # Run tests using Mill built using SBT -target/bin/mill all {main,scalalib,scalajslib}.test +target/bin/mill all {clientserver,main,scalalib,scalajslib}.test target/bin/mill integration.test "mill.integration.local.{AcyclicTests,JawnTests,UpickleTests}" -target/bin/mill devAssembly +target/bin/mill dev.assembly diff --git a/ci/test-sbt.sh b/ci/test-sbt.sh index 8b728916..a57b06e2 100755 --- a/ci/test-sbt.sh +++ b/ci/test-sbt.sh @@ -6,6 +6,6 @@ set -eux git clean -xdf # First build & run tests using SBT -sbt core/test main/test scalalib/test scalajslib/test +sbt core/test clientserver/test main/test scalalib/test scalajslib/test sbt "integration/test-only -- mill.integration.local.{AmmoniteTests,BetterFilesTests}" sbt bin/test:assembly |