diff options
Diffstat (limited to 'ci')
-rwxr-xr-x | ci/publish-local.sh | 11 | ||||
-rwxr-xr-x | ci/test-mill-built.sh | 6 | ||||
-rwxr-xr-x | ci/test-mill-release.sh | 11 | ||||
-rwxr-xr-x | ci/test-sbt-built.sh | 3 | ||||
-rwxr-xr-x | ci/test-sbt.sh | 2 |
5 files changed, 17 insertions, 16 deletions
diff --git a/ci/publish-local.sh b/ci/publish-local.sh new file mode 100755 index 00000000..a26a590d --- /dev/null +++ b/ci/publish-local.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +set -eux + +# First build using SBT +sbt bin/test:assembly + +# Build Mill using SBT +target/bin/mill all __.publishLocal releaseAssembly + +mv out/releaseAssembly/dest/out.jar ~/mill-release diff --git a/ci/test-mill-built.sh b/ci/test-mill-built.sh index 61fcf294..c63e9804 100755 --- a/ci/test-mill-built.sh +++ b/ci/test-mill-built.sh @@ -5,8 +5,7 @@ set -eux # Starting from scratch... git clean -xdf -# First build using SBT -sbt bin/test:assembly +ci/publish-local.sh # Build Mill using SBT target/bin/mill devAssembly @@ -14,6 +13,5 @@ target/bin/mill devAssembly # 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.local.AmmoniteTests -out/devAssembly/dest/out.jar integration.test "mill.integration.local.{AcyclicTests,BetterFilesTests,JawnTests,UpickleTests}" +out/devAssembly/dest/out.jar integration.test "mill.integration.forked.{AmmoniteTests,BetterFilesTests}" out/devAssembly/dest/out.jar devAssembly diff --git a/ci/test-mill-release.sh b/ci/test-mill-release.sh index f8e27ed4..0b874d48 100755 --- a/ci/test-mill-release.sh +++ b/ci/test-mill-release.sh @@ -5,19 +5,12 @@ set -eux # Starting from scratch... git clean -xdf -# First build using SBT -sbt bin/test:assembly - -# Build Mill using SBT -target/bin/mill all __.publishLocal releaseAssembly - -mv out/releaseAssembly/dest/out.jar ~/mill-release +ci/publish-local.sh git clean -xdf # Second build & run tests using Mill ~/mill-release all {main,scalalib,scalajslib}.test -~/mill-release integration.test mill.integration.forked.AmmoniteTests -~/mill-release integration.test "mill.integration.forked.{AcyclicTests,BetterFilesTests,JawnTests,UpickleTests}" +~/mill-release integration.test "mill.integration.forked.{AcyclicTests,JawnTests,UpickleTests}" ~/mill-release devAssembly diff --git a/ci/test-sbt-built.sh b/ci/test-sbt-built.sh index b27be37f..e93eb4fc 100755 --- a/ci/test-sbt-built.sh +++ b/ci/test-sbt-built.sh @@ -9,6 +9,5 @@ sbt bin/test:assembly # Run tests using Mill built using SBT target/bin/mill all {main,scalalib,scalajslib}.test -target/bin/mill integration.test mill.integration.local.AmmoniteTests -target/bin/mill integration.test "mill.integration.local.{AcyclicTests,BetterFilesTests,JawnTests,UpickleTests}" +target/bin/mill integration.test "mill.integration.local.{AcyclicTests,JawnTests,UpickleTests}" target/bin/mill devAssembly diff --git a/ci/test-sbt.sh b/ci/test-sbt.sh index b54b39e1..8b728916 100755 --- a/ci/test-sbt.sh +++ b/ci/test-sbt.sh @@ -7,5 +7,5 @@ git clean -xdf # First build & run tests using SBT sbt core/test main/test scalalib/test scalajslib/test -sbt "integration/test-only -- mill.integration.local" +sbt "integration/test-only -- mill.integration.local.{AmmoniteTests,BetterFilesTests}" sbt bin/test:assembly |