diff options
| author | Robby <robby@k-state.edu> | 2018-04-07 06:51:33 -0500 |
|---|---|---|
| committer | Robby <robby@k-state.edu> | 2018-04-07 06:51:33 -0500 |
| commit | 9043688cb48442a51296fa2ef39f8e679dffc574 (patch) | |
| tree | aa3661e32a5b24b5c2881096604c91d0ee808c88 /.travis.yml | |
| parent | b9200526d099a4d942bdd8839e301acbe3bad184 (diff) | |
| parent | e628c84be7cf0b7bb00ba2141635d29503203fc4 (diff) | |
| download | mill-9043688cb48442a51296fa2ef39f8e679dffc574.tar.gz mill-9043688cb48442a51296fa2ef39f8e679dffc574.tar.bz2 mill-9043688cb48442a51296fa2ef39f8e679dffc574.zip | |
Merge branch 'master' into restore-master
# Conflicts:
# .travis.yml
# scalalib/src/mill/scalalib/Dep.scala
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index a989ab14..a419ea32 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,9 +5,6 @@ dist: trusty matrix: include: - stage: build - env: CI_SCRIPT=ci/test-mill-bootstrap.sh - jdk: oraclejdk9 - - stage: build env: CI_SCRIPT=ci/test-mill-0.sh jdk: oraclejdk8 - stage: build @@ -18,16 +15,21 @@ matrix: jdk: oraclejdk8 - stage: build env: CI_SCRIPT=ci/test-mill-dev.sh - jdk: oraclejdk9 + jdk: oraclejdk8 - stage: build - env: CI_SCRIPT=ci/test-mill-dev.sh + env: CI_SCRIPT=ci/test-mill-release.sh jdk: oraclejdk8 + - stage: build env: CI_SCRIPT=ci/test-mill-release.sh jdk: oraclejdk9 - stage: build - env: CI_SCRIPT=ci/test-mill-release.sh - jdk: oraclejdk8 + env: CI_SCRIPT=ci/test-mill-dev.sh + jdk: oraclejdk9 + - stage: build + env: CI_SCRIPT=ci/test-mill-0.sh + jdk: oraclejdk9 + - stage: release env: CI_SCRIPT="ci/on-master.py ci/release.sh" jdk: oraclejdk8 |