Skip to content

Commit

Permalink
Fix travis configuration for JDK 8
Browse files Browse the repository at this point in the history
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
  • Loading branch information
damienmg authored and kchodorow committed Jun 16, 2015
1 parent 5b4ffae commit 7cf300e
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
11 changes: 9 additions & 2 deletions .travis/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions compile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 7cf300e

Please sign in to comment.