summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2019-07-09 03:30:23 +0800
committerLi Haoyi <haoyi.sg@gmail.com>2019-07-09 03:30:23 +0800
commit6529614982824739d84837b01a3483e746eb9878 (patch)
tree5b365c8d42d31ea1eaa91be112c6772320257be8
parentc9f7fdb41aa6f241c66b2a8d01775d07310363fa (diff)
downloadmill-6529614982824739d84837b01a3483e746eb9878.tar.gz
mill-6529614982824739d84837b01a3483e746eb9878.tar.bz2
mill-6529614982824739d84837b01a3483e746eb9878.zip
.
-rw-r--r--.travis.yml12
-rwxr-xr-xci/test-mill-dev.sh2
2 files changed, 5 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml
index f2d6daa9..917ec5d9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,12 +18,8 @@ matrix:
env: CI_SCRIPT=ci/test-mill-dev.sh
jdk: oraclejdk10
- stage: build
- env: CI_SCRIPT=ci/test-mill-dev.sh
- jdk: oraclejdk11
-
- - stage: build
env: CI_SCRIPT=ci/test-mill-bootstrap-0.sh
- jdk: oraclejdk8
+ jdk: oraclejdk11
- stage: build
env: CI_SCRIPT=ci/test-mill-bootstrap-1.sh
@@ -31,13 +27,13 @@ matrix:
- stage: build
env: CI_SCRIPT=ci/test-mill-0.sh
- jdk: oraclejdk10
+ jdk: oraclejdk9
- stage: build
env: CI_SCRIPT=ci/test-mill-1.sh
- jdk: oraclejdk11
+ jdk: oraclejdk10
- stage: build
env: CI_SCRIPT=ci/test-mill-2.sh
- jdk: oraclejdk8
+ jdk: oraclejdk11
- stage: release
diff --git a/ci/test-mill-dev.sh b/ci/test-mill-dev.sh
index d81fe0df..4cd7b724 100755
--- a/ci/test-mill-dev.sh
+++ b/ci/test-mill-dev.sh
@@ -13,5 +13,5 @@ rm -rf ~/.mill
# Second build & run tests
out/dev/assembly/dest/mill -i main.test.compile
-#out/dev/assembly/dest/mill -i all {main,scalalib,scalajslib,contrib.twirllib,contrib.scalapblib}.test
+out/dev/assembly/dest/mill -i all {main,scalalib,scalajslib,contrib.twirllib,contrib.scalapblib}.test