diff options
author | Li Haoyi <haoyi.sg@gmail.com> | 2018-04-07 10:28:42 -0700 |
---|---|---|
committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-04-07 10:28:42 -0700 |
commit | ec2db702115527cadf5174eac8dbc413f783e686 (patch) | |
tree | b9d18bba4128aa5f4d96ab569b0c624c15871824 | |
parent | a6e0858c2d8400f43bddec0dbf927aec406d92a7 (diff) | |
download | mill-ec2db702115527cadf5174eac8dbc413f783e686.tar.gz mill-ec2db702115527cadf5174eac8dbc413f783e686.tar.bz2 mill-ec2db702115527cadf5174eac8dbc413f783e686.zip |
re-enabled deletion of ~/.mill folder between CI steps
-rwxr-xr-x | ci/test-mill-bootstrap.sh | 4 | ||||
-rwxr-xr-x | ci/test-mill-dev.sh | 2 | ||||
-rwxr-xr-x | ci/test-mill-release.sh | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/ci/test-mill-bootstrap.sh b/ci/test-mill-bootstrap.sh index be2b5c3a..537e51f5 100755 --- a/ci/test-mill-bootstrap.sh +++ b/ci/test-mill-bootstrap.sh @@ -12,6 +12,8 @@ mv out/release/dest/mill ~/mill-1 # Clean up git clean -xdf +rm -rf ~/.mill + # Differentiate first and second builds echo "Build 2" > info.txt && git add info.txt && git commit -m "Add info.txt" @@ -22,5 +24,7 @@ mv out/release/dest/mill ~/mill-2 # Clean up git clean -xdf +rm -rf ~/.mill + # 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 52deb139..f2d82724 100755 --- a/ci/test-mill-dev.sh +++ b/ci/test-mill-dev.sh @@ -8,6 +8,8 @@ git clean -xdf # Build Mill mill -i dev.assembly +rm -rf ~/.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 f1fb10ae..e5ea2b67 100755 --- a/ci/test-mill-release.sh +++ b/ci/test-mill-release.sh @@ -11,5 +11,7 @@ ci/publish-local.sh # Clean up git clean -xdf +rm -rf ~/.mill + # Run tests ~/mill-release -i integration.test "mill.integration.forked.{AcyclicTests,UpickleTests,PlayJsonTests}" |