diff options
author | Bogdan Drutu <bdrutu@google.com> | 2017-04-24 12:59:58 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-24 12:59:58 -0700 |
commit | d3df5df792b5f2fdd7936095a2d9b51f79e1a633 (patch) | |
tree | 1bfae75323d71c678739e3a8888e2706722f2fe3 /.travis.yml | |
parent | 18b12d98f185aa80b4620aaf02e6707ca689844c (diff) | |
download | opencensus-java-d3df5df792b5f2fdd7936095a2d9b51f79e1a633.tar.gz |
Update travis to build on osx as well. (#245)
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index dda780a8..864e8135 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,16 +1,23 @@ -sudo: required -dist: trusty +sudo: false + language: java matrix: include: - jdk: oraclejdk7 env: TASK=BUILD + os: linux - jdk: oraclejdk8 env: TASK=BUILD + os: linux + + # Work around https://github.com/travis-ci/travis-ci/issues/2317 + - env: TASK=BUILD + os: osx - env: TASK=CHECK_GIT_HISTORY + os: linux before_install: - git log --oneline --decorate --graph -30 @@ -43,7 +50,7 @@ script: esac after_success: - - if \[ "$TASK" == "BUILD" \] && \[ "$TRAVIS_JDK_VERSION" == "oraclejdk8" \]; then + - if \[ "$TASK" == "BUILD" \] && \[ "$TRAVIS_JDK_VERSION" == "oraclejdk8" \] && \[ "$TRAVIS_OS_NAME" = linux \]; then ./gradlew :instrumentation-java-all:coveralls --stacktrace ; bash <(curl -s https://codecov.io/bash) ; fi |