summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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