diff options
| author | Hailong Wen <hailongwen@google.com> | 2017-12-07 17:48:16 -0800 |
|---|---|---|
| committer | Hailong Wen <hailongwen@google.com> | 2017-12-07 17:48:16 -0800 |
| commit | cf24e3f3d705ae69408d3d356ba3503c82320329 (patch) | |
| tree | 3e6a6d08e84592dab79fc78abafdc0d99f021fb9 /scripts | |
| parent | 847cd882a70f0e20a9c112ceb1865c6a078df03c (diff) | |
| download | platform_external_opencensus-java-cf24e3f3d705ae69408d3d356ba3503c82320329.tar.gz platform_external_opencensus-java-cf24e3f3d705ae69408d3d356ba3503c82320329.tar.bz2 platform_external_opencensus-java-cf24e3f3d705ae69408d3d356ba3503c82320329.zip | |
Fix Java 7 travis build script.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/travis_script | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/travis_script b/scripts/travis_script index 3744626a..ff3d7c9a 100755 --- a/scripts/travis_script +++ b/scripts/travis_script @@ -30,7 +30,6 @@ case "$TASK" in JAVA_HOME="$(jdk_switcher home openjdk8)" ./gradlew classes testClasses ./gradlew clean assemble --stacktrace ./gradlew check - pushd examples && ./gradlew clean assemble check --stacktrace && popd ;; *) echo "Unknown JDK version $TRAVIS_JDK_VERSION" @@ -43,7 +42,10 @@ case "$TASK" in # https://docs.travis-ci.com/user/reference/osx/#JDK-and-OS-X ./gradlew clean assemble --stacktrace ./gradlew check - pushd examples && ./gradlew clean assemble check --stacktrace && popd + java_version=`java -version 2>&1 | awk -F '"' '/version/ {print $2}'` + if [[ ! "$java_version" < "1.8" ]]; then + pushd examples && ./gradlew clean assemble check --stacktrace && popd + fi ;; *) echo "Unknown OS name $TRAVIS_OS_NAME" |