diff options
| author |  Damien Martin-Guillerez <dmarting@google.com> | 2015-06-16 12:31:03 +0000 |
|---|---|---|
| committer |  Kristina Chodorow <kchodorow@google.com> | 2015-06-16 14:00:40 +0000 |
| commit | 7cf300e13b687ff7119b0094f3a640f24dd2b796 (patch) | |
| tree | a16e52cd6a2ce78a80567513550ed1ae1041265f | |
| parent | 5b4ffaec96af206624a95692cbda4ea20d6a64a0 (diff) | |
Fix travis configuration for JDK 8
This is a replay of the changes from https://bazel-review.googlesource.com/#/c/1520
and that didn't got imported on the import CL.
--
MOS_MIGRATED_REVID=96099800
| -rwxr-xr-x | .travis/build.sh | 11 | ||||
| -rwxr-xr-x | compile.sh | 1 |
2 files changed, 10 insertions, 2 deletions
diff --git a/.travis/build.sh b/.travis/build.sh index 6617e9f3f3..59ca60e536 100755 --- a/.travis/build.sh +++ b/.travis/build.sh @@ -22,8 +22,15 @@ if [ -z "${TRAVIS_OS_NAME+x}" ]; then fi if [[ $TRAVIS_OS_NAME = 'osx' ]]; then - # TODO(dmarting) ./compile.sh all - true + export JAVA_VERSION=1.7 + sed -i.bak 's/_version = "8",/_version = "7",/' tools/jdk/BUILD + cat .travis/jdk7.WORKSPACE >WORKSPACE + # Ignore zip tests as they requires to much space and jdk8 stuff + cat <<'EOF' >.bazelrc +build --test_tag_filters -zip,-jdk8 +EOF + export BAZELRC=$PWD/.bazelrc + ./compile.sh all else sudo apt-get update -qq sudo apt-get install -y netcat-traditional diff --git a/compile.sh b/compile.sh index 6bffcd231e..aaa4ba6e10 100755 --- a/compile.sh +++ b/compile.sh @@ -154,6 +154,7 @@ if [ $DO_TESTS ]; then new_step "Running tests" display "." $BAZEL --blazerc=${BAZELRC} --nomaster_blazerc test \ + --build_tests_only \ --javacopt="-source ${JAVA_VERSION} -target ${JAVA_VERSION}" \ -k --test_output=errors //src/... //third_party/ijar/... //scripts/... \ || fail "Tests failed" |