summaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
Diffstat (limited to 'ci')
-rwxr-xr-xci/test-mill-built.sh2
-rwxr-xr-xci/test-mill-release.sh4
-rwxr-xr-xci/test-sbt-built.sh2
-rwxr-xr-xci/test-sbt.sh2
-rwxr-xr-xci/test_all.sh15
5 files changed, 5 insertions, 20 deletions
diff --git a/ci/test-mill-built.sh b/ci/test-mill-built.sh
index 5b3b1a28..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 5e19bcdc..6c38c764 100755
--- a/ci/test-mill-release.sh
+++ b/ci/test-mill-release.sh
@@ -9,7 +9,7 @@ git clean -xdf
sbt bin/test:assembly
# Build Mill using SBT
-target/bin/mill --all _.publishLocal releaseAssembly
+target/bin/mill all __.publishLocal releaseAssembly
mv out/releaseAssembly/dest/out.jar ~/mill-release
@@ -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 ebb3ddb5..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 74b6d203..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