diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2016-09-08 16:32:57 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2016-09-08 16:39:39 +1000 |
| commit | d2655c974330f3c32ef090b1c6d0c1d8e4c49838 (patch) | |
| tree | 80d2412521ce7e4169c51b8c0860174c1321a0f8 /.travis.yml | |
| parent | c15c45292b1cb858b32e3967d53126c9cc36f41b (diff) | |
| download | scala-async-d2655c974330f3c32ef090b1c6d0c1d8e4c49838.tar.gz scala-async-d2655c974330f3c32ef090b1c6d0c1d8e4c49838.tar.bz2 scala-async-d2655c974330f3c32ef090b1c6d0c1d8e4c49838.zip | |
Rework build logic to determine which JDK use for release build
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml index df51411..4141cfb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,6 @@ language: scala sudo: false env: global: - - PUBLISH_JDK=openjdk6 # admin/build.sh only publishes when running on this jdk # Don't commit sensitive files, instead commit a version encrypted with $SECRET, # this environment variable is encrypted with this repo's private key and stored below: # (See http://docs.travis-ci.com/user/environment-variables/#Secure-Variables.) @@ -10,17 +9,16 @@ env: script: - admin/build.sh -scala: - - 2.11.8 - - 2.12.0-RC1 # !!! Duplicated below, edit with care -jdk: - - openjdk6 - - oraclejdk8 matrix: - exclude: - - - scala: 2.12.0-RC1 # !!! Duplicated above, edit with care + include: + - scala: 2.11.8 jdk: openjdk6 + env: IS_PUBLISH_JDK=true + - scala: 2.11.8 + jdk: oraclejdk8 + - scala: 2.12.0-RC1 + jdk: oraclejdk8 + env: IS_PUBLISH_JDK=true notifications: email: - jason.zaugg@typesafe.com |