diff options
-rw-r--r-- | .appveyor.yml | 2 | ||||
-rw-r--r-- | .travis.yml | 4 | ||||
-rwxr-xr-x | ci/test-mill-0.sh | 4 | ||||
-rwxr-xr-x | ci/test-mill-1.sh | 2 | ||||
-rwxr-xr-x | ci/test-mill-2.sh | 2 | ||||
-rwxr-xr-x | ci/test-mill-bootstrap.sh | 26 | ||||
-rwxr-xr-x | ci/test-mill-dev.sh | 4 | ||||
-rwxr-xr-x | ci/test-mill-release.sh | 7 |
8 files changed, 37 insertions, 14 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index dde8a587..fb17f2e8 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -27,7 +27,7 @@ cache: - '%LOCALAPPDATA%\Coursier\cache -> build.sc' install: - - SET MILL_URL=https://github.com/lihaoyi/mill/releases/download/0.1.7/0.1.7-8-b913c6 + - SET MILL_URL=https://github.com/lihaoyi/mill/releases/download/0.1.7/0.1.7-29-f5097f build_script: - if [%COMPILER%]==[msys2] ( diff --git a/.travis.yml b/.travis.yml index b63d7028..a989ab14 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ dist: trusty matrix: include: - stage: build - env: CI_SCRIPT=ci/test-mill-0.sh + env: CI_SCRIPT=ci/test-mill-bootstrap.sh jdk: oraclejdk9 - stage: build env: CI_SCRIPT=ci/test-mill-0.sh @@ -36,7 +36,7 @@ matrix: jdk: oraclejdk8 script: - - curl -L -o ~/bin/mill https://github.com/lihaoyi/mill/releases/download/0.1.7/0.1.7-8-b913c6 && chmod +x ~/bin/mill + - curl -L -o ~/bin/mill https://github.com/lihaoyi/mill/releases/download/0.1.7/0.1.7-29-f5097f && chmod +x ~/bin/mill - export PATH=~/bin/mill:$PATH - "$CI_SCRIPT" diff --git a/ci/test-mill-0.sh b/ci/test-mill-0.sh index 3d1470f1..2cc78d81 100755 --- a/ci/test-mill-0.sh +++ b/ci/test-mill-0.sh @@ -5,5 +5,5 @@ set -eux # Starting from scratch... git clean -xdf -# Run tests using Mill built using SBT -mill all {clientserver,main,scalalib,scalajslib}.test +# Run tests +mill -i all {clientserver,main,scalalib,scalajslib}.test diff --git a/ci/test-mill-1.sh b/ci/test-mill-1.sh index 079cb519..b0ed7bc2 100755 --- a/ci/test-mill-1.sh +++ b/ci/test-mill-1.sh @@ -5,5 +5,5 @@ set -eux # Starting from scratch... git clean -xdf -# Run tests using Mill built using SBT +# Run tests mill integration.test "mill.integration.local.{JawnTests,BetterFilesTests,UpickleTests}" diff --git a/ci/test-mill-2.sh b/ci/test-mill-2.sh index 3b0da706..ce61bb7c 100755 --- a/ci/test-mill-2.sh +++ b/ci/test-mill-2.sh @@ -5,5 +5,5 @@ set -eux # Starting from scratch... git clean -xdf -# Run tests using Mill built using SBT +# Run tests mill integration.test "mill.integration.local.{AcyclicTests,AmmoniteTests}" diff --git a/ci/test-mill-bootstrap.sh b/ci/test-mill-bootstrap.sh new file mode 100755 index 00000000..be2b5c3a --- /dev/null +++ b/ci/test-mill-bootstrap.sh @@ -0,0 +1,26 @@ +#!/usr/bin/env bash + +set -eux + +# Starting from scratch... +git clean -xdf + +# First build +mill -i all __.publishLocal release +mv out/release/dest/mill ~/mill-1 + +# Clean up +git clean -xdf + +# Differentiate first and second builds +echo "Build 2" > info.txt && git add info.txt && git commit -m "Add info.txt" + +# Second build +~/mill-1 -i all __.publishLocal release +mv out/release/dest/mill ~/mill-2 + +# Clean up +git clean -xdf + +# Use second build to run tests using Mill +~/mill-2 -i all {clientserver,main,scalalib,scalajslib}.test
\ No newline at end of file diff --git a/ci/test-mill-dev.sh b/ci/test-mill-dev.sh index ae8556fb..52deb139 100755 --- a/ci/test-mill-dev.sh +++ b/ci/test-mill-dev.sh @@ -8,8 +8,6 @@ git clean -xdf # Build Mill mill -i dev.assembly -rm -fR ~/.mill - -# Second build & run tests using Mill +# Second build & run tests out/dev/assembly/dest/mill -i all {clientserver,main,scalalib,scalajslib}.test diff --git a/ci/test-mill-release.sh b/ci/test-mill-release.sh index 19173827..f1fb10ae 100755 --- a/ci/test-mill-release.sh +++ b/ci/test-mill-release.sh @@ -5,12 +5,11 @@ set -eux # Starting from scratch... git clean -xdf +# Build Mill ci/publish-local.sh +# Clean up git clean -xdf -rm -fR ~/.mill - -# Second build & run tests using Mill - +# Run tests ~/mill-release -i integration.test "mill.integration.forked.{AcyclicTests,UpickleTests,PlayJsonTests}" |