diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2014-12-18 18:30:52 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2014-12-18 18:30:52 +1000 |
| commit | d469cecfa77339152b8228bec78e6fa85dff0375 (patch) | |
| tree | 6be60a4d18658767b29a70abdf2fd8cc44cb06fa /.travis.yml | |
| parent | c44d2ca0c7e24c98eaaa3c1b5023cfd7cc877ae9 (diff) | |
| parent | 7577a844518b56556e54217720779fd5c5db6b66 (diff) | |
| download | scala-async-d469cecfa77339152b8228bec78e6fa85dff0375.tar.gz scala-async-d469cecfa77339152b8228bec78e6fa85dff0375.tar.bz2 scala-async-d469cecfa77339152b8228bec78e6fa85dff0375.zip | |
Merge remote-tracking branch 'origin/2.10.x' into merge/2.10.x-to-master-tag-driven-release
Conflicts:
.travis.yml
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 9c83747..22ac9a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,17 @@ language: scala + +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.) + - secure: "YO/7YiWEirzz0EAy7oVNmAKroj4qCLZNMkPS+xW/VgeGjuEV+Nk1S7pwxF0o2OggSxIQ+a0lWSrOPQqSXMjOstDIzzGeYfuAt0+0fupXtDDge0mXpCCMadrvYzff1/5XYX0dJ+pjJmz6IgF1hliPJHIuddhhdqPxdHWTHAKm9ME=" + script: - - sbt ++$TRAVIS_SCALA_VERSION clean test publishLocal + - admin/build.sh scala: - - 2.11.1 + - 2.11.4 jdk: - openjdk6 - openjdk7 |