From 1341e29629ec633a8d9db0e1717434ab560aab42 Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Wed, 17 Jan 2018 23:44:01 -0800 Subject: Introduce an Ammonite build to our test suite --- ci/test.sh | 5 +---- ci/test2.sh | 4 ++-- ci/test3.sh | 2 +- ci/test_all.sh | 15 +++++++++++++++ 4 files changed, 19 insertions(+), 7 deletions(-) create mode 100755 ci/test_all.sh (limited to 'ci') diff --git a/ci/test.sh b/ci/test.sh index b03523e1..78060622 100755 --- a/ci/test.sh +++ b/ci/test.sh @@ -6,7 +6,4 @@ set -eux git clean -xdf # First build & run tests using SBT -sbt core/test scalalib/test scalajslib/test -sbt integration/test -sbt bin/test:assembly - +sbt core/test scalalib/test scalajslib/test integration/test bin/test:assembly diff --git a/ci/test2.sh b/ci/test2.sh index 28fa65cd..9d84ecdc 100755 --- a/ci/test2.sh +++ b/ci/test2.sh @@ -5,7 +5,7 @@ set -eux # Starting from scratch... git clean -xdf - sbt bin/test:assembly -# Run tests using + +# Run tests using Mill built using SBT target/bin/mill --all {core,scalalib,scalajslib,integration}.test devAssembly diff --git a/ci/test3.sh b/ci/test3.sh index 0be934c1..ffeb259c 100755 --- a/ci/test3.sh +++ b/ci/test3.sh @@ -5,7 +5,7 @@ set -eux # Starting from scratch... git clean -xdf -# First build & run tests using SBT +# First build using SBT sbt bin/test:assembly # Build Mill using SBT diff --git a/ci/test_all.sh b/ci/test_all.sh new file mode 100755 index 00000000..558f76d6 --- /dev/null +++ b/ci/test_all.sh @@ -0,0 +1,15 @@ +#!/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 --all {core,scalalib,scalajslib,integration}.test devAssembly \ No newline at end of file -- cgit v1.2.3