diff options
| author | Li Haoyi <haoyi.sg@gmail.com> | 2018-02-09 00:14:47 -0800 |
|---|---|---|
| committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-02-09 08:17:47 -0800 |
| commit | 8ddd2fa054bc8639c28db2e95b7903e2954fdb7d (patch) | |
| tree | aa985f1e715f07eb279e6facad61de8a187e316c /ci | |
| parent | 90d0a3388d280554eaa51371f666d2f7a965a8af (diff) | |
| download | mill-8ddd2fa054bc8639c28db2e95b7903e2954fdb7d.tar.gz mill-8ddd2fa054bc8639c28db2e95b7903e2954fdb7d.tar.bz2 mill-8ddd2fa054bc8639c28db2e95b7903e2954fdb7d.zip | |
.
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/test-mill-built.sh | 2 | ||||
| -rwxr-xr-x | ci/test-mill-release.sh | 2 | ||||
| -rwxr-xr-x | ci/test-sbt-built.sh | 2 | ||||
| -rwxr-xr-x | ci/test-sbt.sh | 2 | ||||
| -rwxr-xr-x | ci/test_all.sh | 15 |
5 files changed, 4 insertions, 19 deletions
diff --git a/ci/test-mill-built.sh b/ci/test-mill-built.sh index 52be8851..7a3e8e57 100755 --- a/ci/test-mill-built.sh +++ b/ci/test-mill-built.sh @@ -13,7 +13,7 @@ target/bin/mill devAssembly # Second build & run tests using Mill -out/devAssembly/dest/out.jar all {core,scalalib,scalajslib}.test devAssembly +out/devAssembly/dest/out.jar all {main,scalalib,scalajslib}.test devAssembly out/devAssembly/dest/out.jar integration.test mill.integration.AmmoniteTests out/devAssembly/dest/out.jar integration.test "mill.integration.{AcyclicTests,BetterFilesTests,JawnTests}" out/devAssembly/dest/out.jar devAssembly diff --git a/ci/test-mill-release.sh b/ci/test-mill-release.sh index e3755e93..6c38c764 100755 --- a/ci/test-mill-release.sh +++ b/ci/test-mill-release.sh @@ -17,7 +17,7 @@ git clean -xdf # Second build & run tests using Mill -~/mill-release all {core,scalalib,scalajslib}.test devAssembly +~/mill-release all {main,scalalib,scalajslib}.test devAssembly ~/mill-release integration.test mill.integration.AmmoniteTests ~/mill-release integration.test "mill.integration.{AcyclicTests,BetterFilesTests,JawnTests}" ~/mill-release devAssembly diff --git a/ci/test-sbt-built.sh b/ci/test-sbt-built.sh index 3a60cbd3..bafb5942 100755 --- a/ci/test-sbt-built.sh +++ b/ci/test-sbt-built.sh @@ -8,7 +8,7 @@ git clean -xdf sbt bin/test:assembly # Run tests using Mill built using SBT -target/bin/mill all {core,scalalib,scalajslib}.test devAssembly +target/bin/mill all {main,scalalib,scalajslib}.test devAssembly target/bin/mill integration.test mill.integration.AmmoniteTests target/bin/mill integration.test "mill.integration.{AcyclicTests,BetterFilesTests,JawnTests}" target/bin/mill devAssembly diff --git a/ci/test-sbt.sh b/ci/test-sbt.sh index f77456f7..79d93cf5 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 scalalib/test scalajslib/test +sbt core/test main/test scalalib/test scalajslib/test sbt integration/test sbt bin/test:assembly diff --git a/ci/test_all.sh b/ci/test_all.sh deleted file mode 100755 index a04f7119..00000000 --- a/ci/test_all.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bash - -set -eux - -# Starting from scratch... -git clean -xdf - -# First build & run tests using SBT -sbt core/test scalalib/test scalajslib/test integration/test bin/test:assembly - -# Run tests using Mill built using SBT -target/bin/mill all {core,scalalib,scalajslib,integration}.test devAssembly - -# Second build & run tests using Mill -out/devAssembly/dest/out.jar all {core,scalalib,scalajslib,integration}.test devAssembly
\ No newline at end of file |